21 Commits

Author SHA1 Message Date
xypp
2dbeacf777 添加了新的API 2025-09-15 00:51:23 +08:00
xypp
fa72af9bc3 修复了若干个伐木工作的寻路问题
添加了由女仆自动尝试脱离卡死的功能
2025-09-15 00:19:36 +08:00
xypp
01ec9c0b63 更新依赖 2025-08-16 02:58:55 +08:00
xypp
6a639a4483 更新版本号 2025-08-16 02:42:21 +08:00
xypp
b2db97e8f6 兼容到V1.3.7 2025-08-12 03:12:22 +08:00
xypp
ea3a57d70d 更新版本号格式 2025-07-28 16:04:05 +08:00
xypp
ee3cb071d7 优化了伐木任务的异常占用
为伐木任务的各个行为添加了额外的配置选项
2025-07-28 02:04:51 +08:00
xypp
2b6f231efc bug修复
支持自然指南针和探索指南针
2025-06-13 21:27:55 +08:00
xypp
135f495849 修复了部分情况下伐木任务寻路异常的问题
修复了伐木任务可能存在的不能完整砍伐的问题
修复了指南针的异常,改用床用来寻找玩家出生点
2025-06-04 02:07:47 +08:00
xypp
4d774a875f 修复部分bug
更新Readme
2025-05-16 15:09:11 +08:00
xypp
b6af4b2c18 修复部分bug 2025-05-04 22:17:29 +08:00
xypp
d0cf1a2a29 修复部分bug 2025-05-04 22:17:20 +08:00
xypp
d6028ab375 修复部分bug 2025-05-02 01:18:08 +08:00
xypp
ecddd67a18 玩家救援联动 2025-04-30 14:20:12 +08:00
xypp
a330813d38 伐木任务支持不种植树苗 2025-04-30 00:24:56 +08:00
xypp
09048cc006 Readme 2025-04-29 23:35:36 +08:00
xypp
5423bf54fd 分组
支持了移动目标类任务
支持了定位任务
2025-04-29 23:28:55 +08:00
xypp
154a44bfab 动画待完善,搁置 2025-04-29 01:27:15 +08:00
xypp
9423ca840e Readme 2025-04-27 23:16:37 +08:00
xypp
f856281889 版本号
支持使用锄头作为树叶的工具
2025-04-27 23:07:58 +08:00
xypp
5eaf45a113 优化寻路
优化砍罚目标选择
优化行为顺序
2025-04-27 22:57:56 +08:00
78 changed files with 2785 additions and 277 deletions

27
Readme.md Normal file
View File

@@ -0,0 +1,27 @@
# Maid Useful Tasks
如果需要中文,请访问 [中文版](Readme_zh.md)
An extension mod of TLM(Touhou Little Maid). Add some useful tasks to your Maid.
# Features
## Logging
The maid will cut down the logs around her and plant saplings. You can give the maid an axe and hoe or scissors to speed
up the maid's ability to cut down trees and destroy leaves!
## Locate
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.
+ Some content maybe move to the TLM Mod in the future.

26
Readme_zh.md Normal file
View File

@@ -0,0 +1,26 @@
# Maid Useful Tasks
For English version, visit [English Version](Readme.md)
一个车万女仆的拓展模组,添加了一些实用的女仆任务。
# Features
## Logging
女仆会砍伐身边的原木并种下树苗。你可以给女仆斧头和锄头或剪刀来加速女仆砍树和破坏树叶的速度。
## Locate
女仆会根据手上的物品寻找指定的结构或者玩家出生点。如果女仆和玩家在同一载具上目前只支持扫帚玩家可以按下指定按键默认为V来让女仆控制或部分控制载具。
## Revive
需要`玩家救援`模组
女仆会救援附近倒地的玩家。如果女仆饰品中有不死图腾,则女仆会使用一个。(女仆会消耗一个图腾来跳过你的复活倒计时,而不是像原版一样直接消耗图腾来不死)
# More
+ 模组处于早期开发阶段,一切功能在未来都有可能变化。
+ 模型的一些内容可能会直接合并到TLM中。

View File

@@ -21,7 +21,7 @@ group = mod_group_id
version = mod_version
base {
archivesName = mod_id
archivesName = minecraft_version + "-" + mod_id
}
java {
@@ -65,7 +65,7 @@ minecraft {
// However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
// This default location is a best practice to automatically put the file in the right place in the final jar.
// See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
@@ -133,9 +133,9 @@ repositories {
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
// flatDir {
// dir 'libs'
// }
flatDir {
dir 'libs'
}
maven {
url "https://cursemaven.com"
}
@@ -165,9 +165,23 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/dependency_management.html
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
compileOnly fg.deobf("curse.maven:touhou-little-maid-355044:6440955")
runtimeOnly fg.deobf("curse.maven:touhou-little-maid-355044:6440955")
runtimeOnly fg.deobf("curse.maven:maid-storage-manager-1210244:6455832")
compileOnly fg.deobf("curse.maven:touhou-little-maid-355044:6911704")
runtimeOnly fg.deobf("curse.maven:touhou-little-maid-355044:6911704")
// compileOnly fg.deobf("libs:touhoulittlemaid-${minecraft_version}-release:1.3.7")
// runtimeOnly fg.deobf("libs:touhoulittlemaid-${minecraft_version}-release:1.3.7")
compileOnly fg.deobf("curse.maven:playerrevive-266890:6048921")
compileOnly fg.deobf("curse.maven:creativecore-257814:6383884")
compileOnly fg.deobf("curse.maven:natures-compass-252848:4712189")
compileOnly fg.deobf("curse.maven:explorers-compass-491794:4712194")
runtimeOnly fg.deobf("curse.maven:playerrevive-266890:6048921")
runtimeOnly fg.deobf("curse.maven:creativecore-257814:6383884")
// runtimeOnly fg.deobf("curse.maven:natures-compass-252848:4712189")
// runtimeOnly fg.deobf("curse.maven:explorers-compass-491794:4712194")
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,)")
}
}
// This block of code expands all declared replace properties in the specified resource targets.
@@ -176,18 +190,19 @@ dependencies {
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
tasks.named('processResources', ProcessResources).configure {
var replaceProperties = [
minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
forge_version: forge_version, forge_version_range: forge_version_range,
minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range,
forge_version : forge_version, forge_version_range: forge_version_range,
loader_version_range: loader_version_range,
mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors: mod_authors, mod_description: mod_description,
mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors : mod_authors, mod_description: mod_description,
]
inputs.properties replaceProperties
filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
expand replaceProperties + [project: project]
}}
}
}
// Example for how to get properties into the manifest for reading at runtime.
tasks.named('jar', Jar).configure {

View File

@@ -1,7 +1,5 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
# The Minecraft version must agree with the Forge version to get a valid artifact
minecraft_version=1.20.1
# The Minecraft version range can use any release version of Minecraft as bounds.
@@ -32,8 +30,6 @@ mapping_channel=official
# The mapping version to query from the mapping channel.
# This must match the format required by the mapping channel.
mapping_version=1.20.1
# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
# Must match the String constant located in the main mod class annotated with @Mod.
mod_id=maid_useful_task
@@ -42,12 +38,12 @@ 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.0.1
mod_version=1.3.7
# 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
mod_group_id=studio.fantasyit
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
mod_authors=
mod_authors=xypp
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
mod_description=
mod_description=Add some useful task for touhou little maid.

View File

@@ -0,0 +1,65 @@
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;
// 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 SELF_RESCUE = BUILDER
.define("misc.self_rescue", true);
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 LOGGING_DISABLE_BLOCKUP = BUILDER
.define("logging.disable_blockup", false);
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 enableSelfRescue = false;
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;
public static boolean disableLoggingBlockUp = false;
@SubscribeEvent
static void onLoad(final ModConfigEvent event) {
enableSelfRescue = SELF_RESCUE.get();
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();
disableLoggingBlockUp = LOGGING_DISABLE_BLOCKUP.get();
}
}

View File

@@ -28,7 +28,9 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import org.slf4j.Logger;
import studio.fantasyit.maid_useful_task.registry.GuiRegistry;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleManager;
// The value here should match an entry in the META-INF/mods.toml file
@Mod(MaidUsefulTask.MODID)
@@ -40,6 +42,9 @@ 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();
}
}

View File

@@ -4,10 +4,19 @@ import com.github.tartaricacid.touhoulittlemaid.api.ILittleMaid;
import com.github.tartaricacid.touhoulittlemaid.api.LittleMaidExtension;
import com.github.tartaricacid.touhoulittlemaid.api.entity.ai.IExtraMaidBrain;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.ExtraMaidBrainManager;
import com.github.tartaricacid.touhoulittlemaid.entity.data.TaskDataRegister;
import com.github.tartaricacid.touhoulittlemaid.entity.item.control.BroomControlManager;
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 studio.fantasyit.maid_useful_task.vehicle.broom.BroomController;
import java.util.List;
@@ -16,7 +25,13 @@ public class UsefulTaskExtension implements ILittleMaid {
@Override
public void addMaidTask(TaskManager manager) {
ILittleMaid.super.addMaidTask(manager);
manager.add(new MaidTreeTask());
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
@@ -28,9 +43,28 @@ public class UsefulTaskExtension implements ILittleMaid {
MemoryModuleRegistry.DESTROY_TARGET.get(),
MemoryModuleRegistry.PLACE_TARGET.get(),
MemoryModuleRegistry.BLOCK_UP_TARGET.get(),
MemoryModuleRegistry.RATE_LIMIT_TOKEN.get()
MemoryModuleRegistry.BLOCK_VALIDATION.get(),
MemoryModuleRegistry.CURRENT_WORK.get(),
MemoryModuleRegistry.COMMON_BLOCK_CACHE.get(),
MemoryModuleRegistry.IS_ALLOW_HANDLE_VEHICLE.get(),
MemoryModuleRegistry.LOCATE_ITEM.get()
);
}
});
}
@Override
public void registerTaskData(TaskDataRegister register) {
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);
}
@Override
public void registerBroomControl(BroomControlManager register) {
register.register(BroomController::new);
}
}

View File

@@ -0,0 +1,29 @@
package studio.fantasyit.maid_useful_task.api;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
@Cancelable
public class ItemLocateEvent extends Event {
public final ItemStack itemStack;
public final EntityMaid maid;
public final BlockPos cache;
public BlockPos target = null;
public ItemLocateEvent(ItemStack itemStack, EntityMaid maid, BlockPos cache) {
this.itemStack = itemStack;
this.maid = maid;
this.cache = cache;
}
public BlockPos getTarget() {
return target;
}
public void setTarget(BlockPos target) {
this.target = target;
}
}

View File

@@ -1,21 +0,0 @@
package studio.fantasyit.maid_useful_task.behavior;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import java.util.Map;
public class LoopWithTokenBehavior extends Behavior<EntityMaid> {
public LoopWithTokenBehavior() {
super(Map.of());
}
@Override
protected void start(ServerLevel p_22540_, EntityMaid p_22541_, long p_22542_) {
MemoryUtil.getRateLimitToken(p_22541_).tick(p_22541_);
}
}

View File

@@ -0,0 +1,185 @@
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));
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));
}
}
}

View File

@@ -1,4 +1,4 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
@@ -7,8 +7,8 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import net.minecraft.world.level.block.state.BlockState;
import studio.fantasyit.maid_useful_task.memory.BlockUpContext;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.IMaidBlockUpTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
@@ -28,14 +28,15 @@ public class BlockUpDestroyBehavior extends Behavior<EntityMaid> {
}
public BlockUpDestroyBehavior() {
super(Map.of(),200);
super(Map.of(), 500);
}
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid p_22539_) {
if (!Conditions.isCurrent(p_22539_, CurrentWork.BLOCKUP_DOWN)) return false;
if (!MemoryUtil.getBlockUpContext(p_22539_).hasTarget()) return false;
if (MemoryUtil.getBlockUpContext(p_22539_).getStatus() != BlockUpContext.STATUS.DOWN) return false;
return Conditions.hasReachedValidTargetOrReset(p_22539_, 0.8f);
return true;
}
@Override
@@ -63,8 +64,7 @@ public class BlockUpDestroyBehavior extends Behavior<EntityMaid> {
BlockPos targetPos = maid.blockPosition().below();
maid.swing(InteractionHand.MAIN_HAND);
MemoryUtil.setLookAt(maid, targetPos);
BlockState targetBlockState = level.getBlockState(targetPos);
float speed = fakePlayer.getMainHandItem().getDestroySpeed(targetBlockState) / fakePlayer.getDigSpeed(targetBlockState, targetPos) / 30;
float speed = MaidUtils.getDestroyProgressDelta(maid, targetPos);
progress += speed;
if (progress >= 1f) {
MaidUtils.destroyBlock(maid, targetPos);
@@ -72,10 +72,12 @@ public class BlockUpDestroyBehavior extends Behavior<EntityMaid> {
}
}
}
@Override
protected void stop(ServerLevel p_22548_, EntityMaid maid, long p_22550_) {
super.stop(p_22548_, maid, p_22550_);
context.setStatus(BlockUpContext.STATUS.IDLE);
context.clearStartTarget();
MemoryUtil.clearTarget(maid);
MemoryUtil.setCurrent(maid, CurrentWork.IDLE);
}
}

View File

@@ -1,4 +1,4 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
@@ -7,10 +7,10 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import net.minecraft.world.level.levelgen.structure.BoundingBox;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import studio.fantasyit.maid_useful_task.memory.BlockUpContext;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.IMaidBlockUpTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
@@ -34,6 +34,7 @@ public class BlockUpPlaceBehavior extends Behavior<EntityMaid> {
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid p_22539_) {
if (!Conditions.isCurrent(p_22539_, CurrentWork.BLOCKUP_UP)) return false;
if (!MemoryUtil.getBlockUpContext(p_22539_).hasTarget()) return false;
if (MemoryUtil.getBlockUpContext(p_22539_).getStatus() != BlockUpContext.STATUS.UP) return false;
return Conditions.hasReachedValidTargetOrReset(p_22539_, 0.8f);
@@ -42,7 +43,8 @@ public class BlockUpPlaceBehavior extends Behavior<EntityMaid> {
@Override
protected boolean canStillUse(ServerLevel p_22545_, EntityMaid maid, long p_22547_) {
if (MemoryUtil.getBlockUpContext(maid).getStatus() != BlockUpContext.STATUS.UP) return false;
if (!p_22545_.getBlockState(maid.blockPosition().above().above()).isAir()) return false;
if (maid.onGround() && !p_22545_.getBlockState(maid.blockPosition().above().above()).isAir()) return false;
if (maid.getY() > context.getTargetPos().getY() + 2) return false;
return !(maid.blockPosition().equals(context.getTargetPos()) && maid.onGround());
}
@@ -58,9 +60,7 @@ public class BlockUpPlaceBehavior extends Behavior<EntityMaid> {
AABB boundingBox = maid.getBoundingBox();
BlockPos startPos = context.getStartPos();
Vec3 move = maid.getDeltaMovement();
if (boundingBox.maxX <= startPos.getX() + 1 && boundingBox.maxZ <= startPos.getZ() + 1
&& boundingBox.minX >= startPos.getX() && boundingBox.minZ >= startPos.getZ()
) {
if (boundingBox.maxX <= startPos.getX() + 1 && boundingBox.maxZ <= startPos.getZ() + 1 && boundingBox.minX >= startPos.getX() && boundingBox.minZ >= startPos.getZ()) {
maid.setDeltaMovement(0, move.y, 0);
return true;
}
@@ -78,9 +78,7 @@ public class BlockUpPlaceBehavior extends Behavior<EntityMaid> {
task.swapValidItemToHand(maid);
BlockPos pos = maid.blockPosition();
BlockPos below = pos.below();
if (context.isOnLine(pos))
if (below.equals(context.getTargetPos()))
return;
if (context.isOnLine(pos)) if (below.equals(context.getTargetPos())) return;
if (level.getBlockState(below).canBeReplaced() && level.getBlockState(pos).canBeReplaced()) {
maid.swing(InteractionHand.MAIN_HAND);
MaidUtils.placeBlock(maid, below);
@@ -99,10 +97,14 @@ public class BlockUpPlaceBehavior extends Behavior<EntityMaid> {
protected void stop(ServerLevel p_22548_, EntityMaid maid, long p_22550_) {
super.stop(p_22548_, maid, p_22550_);
context.setStatus(BlockUpContext.STATUS.IDLE);
if (!maid.blockPosition().equals(context.getTargetPos())) {
BlockPos startPos = context.getStartPos();
BlockPos blockPos = maid.blockPosition();
context.setStartTarget(new BlockPos(blockPos.getX(), startPos.getY(), blockPos.getZ()), blockPos);
if (context.hasTarget()) {
if (!maid.blockPosition().equals(context.getTargetPos())) {
BlockPos startPos = context.getStartPos();
BlockPos blockPos = maid.blockPosition();
context.setStartTarget(new BlockPos(blockPos.getX(), startPos.getY(), blockPos.getZ()), blockPos);
}
MemoryUtil.setCurrent(maid, CurrentWork.BLOCKUP_DESTROY);
}
MemoryUtil.clearTarget(maid);
}

View File

@@ -1,6 +1,5 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.task.MaidCheckRateTask;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
import com.google.common.collect.ImmutableMap;
@@ -13,12 +12,11 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import oshi.util.tuples.Pair;
import studio.fantasyit.maid_useful_task.memory.BlockUpContext;
import studio.fantasyit.maid_useful_task.memory.TaskRateLimitToken;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.IMaidBlockUpTask;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import java.util.Map;
public class BlockUpScheduleBehavior extends Behavior<EntityMaid> {
public BlockUpScheduleBehavior() {
super(ImmutableMap.of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, InitEntities.TARGET_POS.get(), MemoryStatus.VALUE_ABSENT));
@@ -26,7 +24,10 @@ public class BlockUpScheduleBehavior extends Behavior<EntityMaid> {
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid p_22539_) {
if (MemoryUtil.getRateLimitToken(p_22539_).isFor(TaskRateLimitToken.Level.L3)) {
if (!switch (MemoryUtil.getCurrent(p_22539_)) {
case BLOCKUP_UP, BLOCKUP_DOWN, BLOCKUP_DESTROY, IDLE -> true;
default -> false;
}) {
return false;
}
return super.checkExtraStartConditions(p_22538_, p_22539_);
@@ -37,23 +38,35 @@ public class BlockUpScheduleBehavior extends Behavior<EntityMaid> {
BlockUpContext context = MemoryUtil.getBlockUpContext(maid);
IMaidBlockUpTask task = (IMaidBlockUpTask) maid.getTask();
if (context.hasTarget()) {
if (context.getStatus() != BlockUpContext.STATUS.IDLE && MemoryUtil.getTargetPos(maid) == null) {
if (context.getStatus() != BlockUpContext.STATUS.UP && !context.isOnLine(maid.blockPosition())) {
context.clearStartTarget();
MemoryUtil.setCurrent(maid, CurrentWork.IDLE);
} else if (context.getStatus() != BlockUpContext.STATUS.IDLE && MemoryUtil.getTargetPos(maid) == null) {
if (context.getStatus() == BlockUpContext.STATUS.DOWN) {
MemoryUtil.setTarget(maid, context.getTargetPos(), 0.5f);
MemoryUtil.setCurrent(maid, CurrentWork.BLOCKUP_DOWN);
} else if (maid.canPathReach(context.getStartPos())) {
MemoryUtil.setTarget(maid, context.getStartPos(), 0.5f);
MemoryUtil.setCurrent(maid, CurrentWork.BLOCKUP_UP);
} else {
context.clearStartTarget();
}
} else if (!context.isOnLine(maid.blockPosition()) || context.getStartPos().equals(context.getTargetPos())) {
context.clearStartTarget();
} else if (context.getStatus() == BlockUpContext.STATUS.IDLE && !context.isTarget(maid.blockPosition()) && context.isOnLine(maid.blockPosition())) {
context.setStartTarget(context.getStartPos(), maid.blockPosition());
MemoryUtil.setCurrent(maid, CurrentWork.IDLE);
} else if (context.getStatus() == BlockUpContext.STATUS.IDLE && !task.stillValid(maid, maid.blockPosition())) {
maid.getBrain().setMemory(InitEntities.TARGET_POS.get(), new BlockPosTracker(context.getTargetPos()));
context.setStatus(BlockUpContext.STATUS.DOWN);
MemoryUtil.setCurrent(maid, CurrentWork.BLOCKUP_DOWN);
}
} else {
Pair<BlockPos, BlockPos> targetPosBlockUp = task.findTargetPosBlockUp(maid, maid.blockPosition());
Pair<BlockPos, BlockPos> targetPosBlockUp = task.findTargetPosBlockUp(maid, MaidUtils.getMaidRestrictCenter(maid), task.countMaxUsableBlockItems(maid));
if (targetPosBlockUp != null) {
context.setStartTarget(targetPosBlockUp.getA(), targetPosBlockUp.getB());
maid.getBrain().setMemory(InitEntities.TARGET_POS.get(), new BlockPosTracker(targetPosBlockUp.getA()));
BehaviorUtils.setWalkAndLookTargetMemories(maid, targetPosBlockUp.getA(), 0.5f, 0);
context.setStatus(BlockUpContext.STATUS.UP);
MemoryUtil.setCurrent(maid, CurrentWork.BLOCKUP_UP);
}
}
}

View File

@@ -1,4 +1,4 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
@@ -10,9 +10,11 @@ import net.minecraft.world.entity.ai.memory.MemoryStatus;
import net.minecraft.world.level.block.state.BlockState;
import org.jetbrains.annotations.NotNull;
import studio.fantasyit.maid_useful_task.memory.BlockTargetMemory;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.task.IMaidBlockDestroyTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
@@ -32,7 +34,9 @@ public class DestoryBlockBehavior extends Behavior<EntityMaid> {
@Override
protected boolean checkExtraStartConditions(@NotNull ServerLevel worldIn, @NotNull EntityMaid maid) {
return Conditions.hasReachedValidTargetOrReset(maid,1);
if (!Conditions.isCurrent(maid, CurrentWork.DESTROY) && !Conditions.isCurrent(maid, CurrentWork.BLOCKUP_DESTROY))
return false;
return Conditions.hasReachedValidTargetOrReset(maid, 1);
}
@@ -48,8 +52,8 @@ public class DestoryBlockBehavior extends Behavior<EntityMaid> {
super.start(p_22540_, maid, p_22542_);
BlockTargetMemory blockTargetMemory = MemoryUtil.getDestroyTargetMemory(maid);
if (blockTargetMemory != null) {
blockPosSet =new ArrayList<>(blockTargetMemory.getBlockPosSet());
blockPosSet.sort((o1, o2) -> (int) (o1.distSqr(maid.blockPosition()) - o2.distSqr(maid.blockPosition())));
blockPosSet = new ArrayList<>(blockTargetMemory.getBlockPosSet());
blockPosSet.sort((o1, o2) -> (int) (o1.distSqr(maid.blockPosition().above()) - o2.distSqr(maid.blockPosition().above())));
}
index = 0;
task = (IMaidBlockDestroyTask) maid.getTask();
@@ -61,6 +65,8 @@ public class DestoryBlockBehavior extends Behavior<EntityMaid> {
@Override
protected boolean canStillUse(ServerLevel p_22545_, EntityMaid p_22546_, long p_22547_) {
if (MemoryUtil.getCurrent(p_22546_) != CurrentWork.DESTROY && MemoryUtil.getCurrent(p_22546_) != CurrentWork.BLOCKUP_DESTROY)
return false;
return (blockPosSet != null && index < blockPosSet.size()) || targetPos != null;
}
@@ -87,14 +93,13 @@ public class DestoryBlockBehavior extends Behavior<EntityMaid> {
}
private void tickDestroyProgress(EntityMaid maid) {
float speed = fakePlayer.getMainHandItem().getDestroySpeed(targetBlockState) / fakePlayer.getDigSpeed(targetBlockState, targetPos) / 30;
float speed = MaidUtils.getDestroyProgressDelta(maid, targetPos);
MemoryUtil.setLookAt(maid, targetPos);
if (task.availableToGetDrop(maid, fakePlayer, targetPos, targetBlockState)) {
if (speed != 0.0f && task.availableToGetDrop(maid, fakePlayer, targetPos, targetBlockState)) {
maid.swing(InteractionHand.MAIN_HAND);
destroyProgress += speed;
if (destroyProgress >= 1f) {
maid.getMainHandItem().hurt(1, maid.getRandom(), fakePlayer);
task.tryDestroyBlock(maid,targetPos);
task.tryDestroyBlock(maid, targetPos);
destroyProgress = 0f;
targetPos = null;
targetBlockState = null;
@@ -110,6 +115,7 @@ public class DestoryBlockBehavior extends Behavior<EntityMaid> {
super.stop(p_22548_, p_22549_, p_22550_);
MemoryUtil.clearDestroyTargetMemory(p_22549_);
MemoryUtil.clearTarget(p_22549_);
MemoryUtil.setCurrent(p_22549_, CurrentWork.IDLE);
}
@Override

View File

@@ -1,16 +1,16 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.task.MaidMoveToBlockTask;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.MaidPathFindingBFS;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import studio.fantasyit.maid_useful_task.memory.TaskRateLimitToken;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.IMaidBlockDestroyTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import studio.fantasyit.maid_useful_task.util.PosUtils;
import java.util.List;
@@ -26,16 +26,17 @@ public class DestoryBlockMoveBehavior extends MaidCenterMoveToBlockTask {
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid p_22539_) {
if (MemoryUtil.getRateLimitToken(p_22539_).isFor(TaskRateLimitToken.Level.L1)) {
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid maid) {
if (!Conditions.isCurrent(maid, CurrentWork.IDLE) && !Conditions.isCurrent(maid, CurrentWork.BLOCKUP_DESTROY))
return false;
}
return super.checkExtraStartConditions(p_22538_, p_22539_);
return super.checkExtraStartConditions(p_22538_, maid);
}
@Override
protected void start(@NotNull ServerLevel p_22540_, @NotNull EntityMaid maid, long p_22542_) {
super.start(p_22540_, maid, p_22542_);
if (maid.hasRestriction())
this.setSearchRange((int) maid.getRestrictRadius());
task = (IMaidBlockDestroyTask) maid.getTask();
task.tryTakeOutTool(maid);
searchForDestination(p_22540_, maid);
@@ -43,20 +44,28 @@ public class DestoryBlockMoveBehavior extends MaidCenterMoveToBlockTask {
if (target != null && blockPosSet != null) {
blockPosSet.addAll(task.getTryDestroyBlockListBesidesStart(targetPos, target, maid));
MemoryUtil.setDestroyTargetMemory(maid, blockPosSet);
if (Conditions.isCurrent(maid, CurrentWork.IDLE))
MemoryUtil.setCurrent(maid, CurrentWork.DESTROY);
}
}
@Override
protected boolean shouldMoveTo(@NotNull ServerLevel serverLevel, @NotNull EntityMaid entityMaid, @NotNull BlockPos blockPos) {
if (!task.shouldDestroyBlock(entityMaid, blockPos)) return false;
if (!task.shouldDestroyBlock(entityMaid, blockPos.immutable())) return false;
targetPos = blockPos.immutable();
BlockPos startPos = entityMaid.blockPosition();
if (blockPos instanceof BlockPos.MutableBlockPos mb) {
for (int dx = 0; dx < task.reachDistance(); dx = dx <= 0 ? 1 - dx : -dx) {
for (int dy = 0; dy < task.reachDistance(); dy = dy <= 0 ? 1 - dy : -dy) {
for (int dz = 0; dz < task.reachDistance(); dz = dz <= 0 ? 1 - dz : -dz) {
BlockPos pos = mb.offset(dx, dy, dz);
if (!PosUtils.isSafePos(serverLevel, pos)) continue;
if (!Conditions.isGlobalValidTarget(entityMaid, pos, targetPos)) continue;
if (pos.distSqr(targetPos) > task.reachDistance() * task.reachDistance()) continue;
if (entityMaid.isWithinRestriction(pos) && pathfindingBFS.canPathReach(pos)) {
if (Math.abs(startPos.getY() - pos.getY()) >= task.reachDistance()) continue;
if (Math.abs(startPos.getX() - pos.getX()) >= task.reachDistance()) continue;
if (Math.abs(startPos.getZ() - pos.getZ()) >= task.reachDistance()) continue;
if (pos.equals(entityMaid.blockPosition()) || (entityMaid.isWithinRestriction(pos) && pathfindingBFS.canPathReach(pos))) {
blockPosSet = task.toDestroyFromStanding(entityMaid, targetPos, pos);
if (blockPosSet != null) {
mb.set(pos);
@@ -75,7 +84,10 @@ public class DestoryBlockMoveBehavior extends MaidCenterMoveToBlockTask {
@Override
protected @NotNull MaidPathFindingBFS getOrCreateArrivalMap(@NotNull ServerLevel worldIn, @NotNull EntityMaid maid) {
if (this.pathfindingBFS == null)
this.pathfindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, 14);
if (maid.hasRestriction())
this.pathfindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, (int) maid.getRestrictRadius() + 1, task.reachDistance() + 2);
else
this.pathfindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, task.reachDistance() + 1, task.reachDistance() + 2);
return this.pathfindingBFS;
}
@@ -84,4 +96,4 @@ public class DestoryBlockMoveBehavior extends MaidCenterMoveToBlockTask {
super.clearCurrentArrivalMap(pathFinding);
this.pathfindingBFS = null;
}
}
}

View File

@@ -0,0 +1,85 @@
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.item.EntityBroom;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
import com.google.common.collect.ImmutableMap;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.tags.StructureTags;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import net.minecraft.world.entity.vehicle.Boat;
import net.minecraft.world.item.Items;
import net.minecraft.world.phys.Vec3;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.task.IMaidFindTargetTask;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleManager;
public class FindTargetMoveBehavior extends Behavior<EntityMaid> {
public FindTargetMoveBehavior() {
super(ImmutableMap.of(
MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT,
InitEntities.TARGET_POS.get(), MemoryStatus.VALUE_ABSENT
));
}
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid maid) {
IMaidFindTargetTask task = (IMaidFindTargetTask) maid.getTask();
if (task.findTarget(p_22538_, maid) == null) return false;
if (maid.hasRestriction()) return false;
LivingEntity owner = maid.getOwner();
return (owner != null && maid.distanceTo(owner) < task.minReScheduleDistance());
}
@Override
protected void start(ServerLevel serverlevel, EntityMaid maid, long p_22542_) {
IMaidFindTargetTask task = (IMaidFindTargetTask) maid.getTask();
LivingEntity owner = maid.getOwner();
if (owner == null) return;
BlockPos target = task.findTarget(serverlevel, maid);
if (target != null) {
if (maid.distanceToSqr(target.getCenter()) < 9) {
maid.getJumpControl().jump();
return;
}
BlockPos finalTarget = target;
BlockPos ownerPos = owner.blockPosition();
BlockPos maidPos = maid.blockPosition();
if (finalTarget.distSqr(ownerPos) > task.maxOutDistance() * task.maxOutDistance()) {
Vec3 dVec = target.getCenter().subtract(owner.position());
dVec = dVec.normalize().scale(task.maxOutDistance() - (double) (task.maxOutDistance() - task.minReScheduleDistance()) / 2);
BlockPos fTarget = maidPos.offset((int) dVec.x, (int) dVec.y, (int) dVec.z);
for (int x = 0; x < 3; x = x <= 0 ? 1 - x : -x) {
for (int z = 0; z < 3; z = z <= 0 ? 1 - z : -z) {
int y = 0;
while (!serverlevel.getBlockState(fTarget.offset(x, y, z)).isAir()) y++;
while (!serverlevel.getBlockState(fTarget.offset(x, y, z)).isAir()) y--;
if (fTarget.offset(x, y, z).distSqr(ownerPos) < task.maxOutDistance() * task.maxOutDistance()) {
finalTarget = fTarget.offset(x, y, z);
}
}
}
}
if (finalTarget.distSqr(maidPos) < task.maxOutDistance() * task.maxOutDistance()) {
double distanceToOwner = maidPos.distSqr(ownerPos);
double speed = 0.4;
if (distanceToOwner < 4 * 4) {
speed = 0.5;
}
if (distanceToOwner < 3 * 3) {
speed = 0.64;
}
MemoryUtil.setTarget(maid, finalTarget, (float) speed);
}
}
}
}

View File

@@ -0,0 +1,42 @@
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
import com.google.common.collect.ImmutableMap;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import net.minecraft.world.item.Items;
import org.jetbrains.annotations.NotNull;
import studio.fantasyit.maid_useful_task.task.IMaidFindTargetTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
public class FindTargetWaitBehavior extends Behavior<EntityMaid> {
public FindTargetWaitBehavior() {
super(ImmutableMap.of(InitEntities.TARGET_POS.get(), MemoryStatus.VALUE_PRESENT));
}
@Override
protected boolean checkExtraStartConditions(ServerLevel serverLevel, EntityMaid maid) {
IMaidFindTargetTask task = (IMaidFindTargetTask) maid.getTask();
if (task.findTarget(serverLevel, maid) == null) return true;
if (maid.hasRestriction()) return false;
LivingEntity owner = maid.getOwner();
if (owner != null && maid.distanceTo(owner) > task.maxOutDistance()) {
return true;
}
return Conditions.hasReachedValidTargetOrReset(maid, 4);
}
@Override
protected void start(@NotNull ServerLevel serverLevel, EntityMaid maid, long p_22542_) {
IMaidFindTargetTask task = (IMaidFindTargetTask) maid.getTask();
if (task.findTarget(serverLevel, maid) == null) {
task.clearCache(maid);
}
MemoryUtil.clearTarget(maid);
}
}

View File

@@ -1,7 +1,6 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.task.MaidCheckRateTask;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.MaidPathFindingBFS;
import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
@@ -13,6 +12,7 @@ import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
import net.minecraft.world.entity.ai.behavior.BlockPosTracker;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
/**
* From https://github.com/TartaricAcid/TouhouLittleMaid
@@ -23,7 +23,7 @@ abstract public class MaidCenterMoveToBlockTask extends Behavior<EntityMaid> {
private static final int MAX_DELAY_TIME = 120;
private final float movementSpeed;
private final int verticalSearchRange;
private final int searchRange;
private int searchRange;
protected int verticalSearchStart;
public MaidCenterMoveToBlockTask(float movementSpeed) {
@@ -33,11 +33,16 @@ abstract public class MaidCenterMoveToBlockTask extends Behavior<EntityMaid> {
public MaidCenterMoveToBlockTask(float movementSpeed, int verticalSearchRange) {
this(movementSpeed, verticalSearchRange, 7);
}
public MaidCenterMoveToBlockTask(float movementSpeed, int verticalSearchRange,int searchRange) {
public MaidCenterMoveToBlockTask(float movementSpeed, int verticalSearchRange, int defaultSearchRange) {
super(ImmutableMap.of(MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, InitEntities.TARGET_POS.get(), MemoryStatus.VALUE_ABSENT));
this.movementSpeed = movementSpeed;
this.verticalSearchRange = verticalSearchRange;
this.searchRange = searchRange;
this.searchRange = defaultSearchRange;
}
public void setSearchRange(int searchRange) {
this.searchRange = searchRange;
}
protected final void searchForDestination(ServerLevel worldIn, EntityMaid maid) {
@@ -45,14 +50,14 @@ abstract public class MaidCenterMoveToBlockTask extends Behavior<EntityMaid> {
BlockPos centrePos = this.getWorkSearchPos(maid);
BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
for(int y = this.verticalSearchStart; y <= this.verticalSearchRange; y = y > 0 ? -y : 1 - y) {
for(int i = 0; i < searchRange; ++i) {
for(int x = 0; x <= i; x = x > 0 ? -x : 1 - x) {
for(int z = x < i && x > -i ? i : 0; z <= i; z = z > 0 ? -z : 1 - z) {
for (int y = this.verticalSearchStart; y <= this.verticalSearchRange; y = y > 0 ? -y : 1 - y) {
for (int i = 0; i < searchRange; ++i) {
for (int x = 0; x <= i; x = x > 0 ? -x : 1 - x) {
for (int z = x < i && x > -i ? i : 0; z <= i; z = z > 0 ? -z : 1 - z) {
mutableBlockPos.setWithOffset(centrePos, x, y - 1, z);
if (maid.isWithinRestriction(mutableBlockPos) && this.shouldMoveTo(worldIn, maid, mutableBlockPos) && this.checkPathReach(maid, pathFinding, mutableBlockPos) && this.checkOwnerPos(maid, mutableBlockPos)) {
if (this.shouldMoveTo(worldIn, maid, mutableBlockPos) && this.checkPathReach(maid, pathFinding, mutableBlockPos) && this.checkOwnerPos(maid, mutableBlockPos)) {
BehaviorUtils.setWalkAndLookTargetMemories(maid, mutableBlockPos, this.movementSpeed, 0);
maid.getBrain().setMemory((MemoryModuleType)InitEntities.TARGET_POS.get(), new BlockPosTracker(mutableBlockPos));
maid.getBrain().setMemory((MemoryModuleType) InitEntities.TARGET_POS.get(), new BlockPosTracker(mutableBlockPos));
this.clearCurrentArrivalMap(pathFinding);
return;
}
@@ -69,11 +74,11 @@ abstract public class MaidCenterMoveToBlockTask extends Behavior<EntityMaid> {
}
protected MaidPathFindingBFS getOrCreateArrivalMap(ServerLevel worldIn, EntityMaid maid) {
return new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid);
return new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, maid.searchRadius(), 9);
}
private BlockPos getWorkSearchPos(EntityMaid maid) {
return maid.blockPosition();
return MaidUtils.getMaidRestrictCenter(maid);
}
private boolean checkOwnerPos(EntityMaid maid, BlockPos mutableBlockPos) {
@@ -86,7 +91,9 @@ abstract public class MaidCenterMoveToBlockTask extends Behavior<EntityMaid> {
protected abstract boolean shouldMoveTo(ServerLevel var1, EntityMaid var2, BlockPos var3);
/** @deprecated */
/**
* @deprecated
*/
@Deprecated(
forRemoval = true
)

View File

@@ -0,0 +1,80 @@
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.VoxelShape;
import studio.fantasyit.maid_useful_task.Config;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.IMaidBlockDestroyTask;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class MaidSelfRescueBehavior extends Behavior<EntityMaid> {
public MaidSelfRescueBehavior() {
super(Map.of(), 600);
}
boolean started = false;
private static boolean isNotSafeAndCanTryToDestroy(ServerLevel level, EntityMaid maid, BlockPos pos, IMaidBlockDestroyTask task) {
BlockState bs = level.getBlockState(pos);
if (bs.isAir()) return false;
VoxelShape collision = bs.getCollisionShape(level, pos);
if (collision.isEmpty()) return false;
return maid.getBoundingBox().intersects(collision.bounds().move(pos)) && bs.isSuffocating(level, pos) && task.mayDestroy(maid, pos);
}
@Override
protected boolean checkExtraStartConditions(ServerLevel level, EntityMaid maid) {
if (!Config.enableSelfRescue) return false;
if (!(maid.getTask() instanceof IMaidBlockDestroyTask ibdt)) return false;
if (isNotSafeAndCanTryToDestroy(level, maid, maid.blockPosition(), ibdt) || isNotSafeAndCanTryToDestroy(level, maid, maid.blockPosition().above(), ibdt))
return true;
return false;
}
@Override
protected boolean canStillUse(ServerLevel p_22545_, EntityMaid p_22546_, long p_22547_) {
return started && checkExtraStartConditions(p_22545_, p_22546_);
}
@Override
protected void start(ServerLevel p_22540_, EntityMaid maid, long p_22542_) {
started = false;
if (MemoryUtil.getCurrent(maid) == CurrentWork.DESTROY) {
//如果执行中破坏任务,则立刻停止。用以清空相关状态
MemoryUtil.setCurrent(maid, CurrentWork.IDLE);
return;
}
//等待上一个任务结束
if (MemoryUtil.getDestroyTargetMemory(maid) != null)
return;
if (!(maid.getTask() instanceof IMaidBlockDestroyTask task))
return;
started = true;
List<BlockPos> list = new ArrayList<>();
if (isNotSafeAndCanTryToDestroy(p_22540_, maid, maid.blockPosition(), task)) {
list.add(maid.blockPosition());
}
if (isNotSafeAndCanTryToDestroy(p_22540_, maid, maid.blockPosition().above(), task)) {
list.add(maid.blockPosition().above());
}
MemoryUtil.setDestroyTargetMemory(maid, list);
MemoryUtil.setTarget(maid, maid.blockPosition(), 0.5f);
MemoryUtil.setCurrent(maid, CurrentWork.DESTROY);
}
@Override
protected void stop(ServerLevel p_22548_, EntityMaid p_22549_, long p_22550_) {
MemoryUtil.clearTarget(p_22549_);
MemoryUtil.setCurrent(p_22549_, CurrentWork.IDLE);
}
}

View File

@@ -1,4 +1,4 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
@@ -7,6 +7,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.ai.behavior.Behavior;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.task.IMaidBlockPlaceTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
@@ -24,8 +25,9 @@ public class PlaceBlockBehavior extends Behavior<EntityMaid> {
}
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid p_22539_) {
return Conditions.hasReachedValidTargetOrReset(p_22539_);
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid maid) {
MemoryUtil.setCurrent(maid, CurrentWork.PLACE);
return Conditions.hasReachedValidTargetOrReset(maid);
}
@Override
@@ -59,5 +61,6 @@ public class PlaceBlockBehavior extends Behavior<EntityMaid> {
super.stop(p_22548_, p_22549_, p_22550_);
MemoryUtil.clearPlaceTarget(p_22549_);
MemoryUtil.clearTarget(p_22549_);
MemoryUtil.setCurrent(p_22549_, CurrentWork.IDLE);
}
}

View File

@@ -1,6 +1,5 @@
package studio.fantasyit.maid_useful_task.behavior;
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.task.MaidMoveToBlockTask;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.MaidPathFindingBFS;
import net.minecraft.core.BlockPos;
@@ -10,7 +9,7 @@ import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import studio.fantasyit.maid_useful_task.memory.TaskRateLimitToken;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.IMaidBlockPlaceTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
@@ -30,16 +29,16 @@ public class PlaceBlockMoveBehavior extends MaidCenterMoveToBlockTask {
@Override
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid p_22539_) {
if (MemoryUtil.getRateLimitToken(p_22539_).isFor(TaskRateLimitToken.Level.L2)) {
return false;
}
return super.checkExtraStartConditions(p_22538_, p_22539_);
protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid maid) {
if (!Conditions.isCurrent(maid, CurrentWork.IDLE)) return false;
return super.checkExtraStartConditions(p_22538_, maid);
}
@Override
protected void start(ServerLevel p_22540_, EntityMaid maid, long p_22542_) {
super.start(p_22540_, maid, p_22542_);
if (maid.hasRestriction())
this.setSearchRange((int) maid.getRestrictRadius());
task = (IMaidBlockPlaceTask) maid.getTask();
CombinedInvWrapper inv = maid.getAvailableInv(true);
List<ItemStack> markedVis = new ArrayList<>();
@@ -52,6 +51,7 @@ public class PlaceBlockMoveBehavior extends MaidCenterMoveToBlockTask {
@Nullable BlockPos target = MemoryUtil.getTargetPos(maid);
if (target != null) {
MemoryUtil.setPlaceTarget(maid, targetPos);
MemoryUtil.setCurrent(maid, CurrentWork.PLACE);
inv.setStackInSlot(finalI, maid.getMainHandItem());
maid.setItemInHand(InteractionHand.MAIN_HAND, targetItem);
return;
@@ -62,7 +62,8 @@ public class PlaceBlockMoveBehavior extends MaidCenterMoveToBlockTask {
@Override
protected boolean shouldMoveTo(ServerLevel serverLevel, EntityMaid entityMaid, BlockPos blockPos) {
if (!task.shouldPlacePos(entityMaid, targetItem, blockPos)) return false;
if (!task.shouldPlacePos(entityMaid, targetItem, blockPos.immutable())) return false;
if (!entityMaid.isWithinRestriction(blockPos)) return false;
targetPos = blockPos.immutable();
if (blockPos instanceof BlockPos.MutableBlockPos mb) {
final int[] dv = {0, 1, -1};
@@ -87,7 +88,10 @@ public class PlaceBlockMoveBehavior extends MaidCenterMoveToBlockTask {
@Override
protected @NotNull MaidPathFindingBFS getOrCreateArrivalMap(@NotNull ServerLevel worldIn, @NotNull EntityMaid maid) {
if (this.pathfindingBFS == null)
this.pathfindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, 10);
if (maid.hasRestriction())
this.pathfindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, (int) maid.getRestrictRadius(), 9);
else
this.pathfindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), worldIn, maid, 7, 9);
return this.pathfindingBFS;
}

View File

@@ -0,0 +1,24 @@
package studio.fantasyit.maid_useful_task.behavior.common;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.task.MaidCheckRateTask;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.ai.memory.MemoryStatus;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import java.util.Map;
public class UpdateValidationMemoryBehavior extends MaidCheckRateTask {
public UpdateValidationMemoryBehavior() {
super(Map.of(MemoryModuleRegistry.BLOCK_VALIDATION.get(), MemoryStatus.VALUE_PRESENT));
this.setMaxCheckRate(600);
}
@Override
protected void start(ServerLevel p_22540_, EntityMaid p_22541_, long p_22542_) {
//Hardcoded range?
MemoryUtil.getBlockValidationMemory(p_22541_).clearFaraway(p_22541_.blockPosition(), 72);
MemoryUtil.getBlockValidationMemory(p_22541_).clearIf(pos -> p_22540_.getBlockState(pos).isAir());
}
}

View File

@@ -0,0 +1,38 @@
package studio.fantasyit.maid_useful_task.client;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.client.Minecraft;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import studio.fantasyit.maid_useful_task.MaidUsefulTask;
import studio.fantasyit.maid_useful_task.network.MaidAllowHandleVehicle;
import studio.fantasyit.maid_useful_task.network.Network;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import static studio.fantasyit.maid_useful_task.client.KeyMapping.KEY_SWITCH_VEHICLE_CONTROL;
@Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
public class KeyEvents {
@SubscribeEvent
@OnlyIn(Dist.CLIENT)
public static void keyInput(InputEvent.Key event) {
while (KEY_SWITCH_VEHICLE_CONTROL.get().consumeClick()) {
Player player = Minecraft.getInstance().player;
if (!player.isPassenger()) return;
EntityMaid maid = player
.getVehicle()
.getPassengers()
.stream()
.filter(entity -> entity instanceof EntityMaid)
.map(entity -> (EntityMaid) entity)
.findAny()
.orElse(null);
if (maid == null) return;
Network.INSTANCE.sendToServer(new MaidAllowHandleVehicle(maid));
}
}
}

View File

@@ -0,0 +1,26 @@
package studio.fantasyit.maid_useful_task.client;
import com.mojang.blaze3d.platform.InputConstants;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.lwjgl.glfw.GLFW;
import studio.fantasyit.maid_useful_task.MaidUsefulTask;
@Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
public class KeyMapping {
public static final Lazy<net.minecraft.client.KeyMapping> KEY_SWITCH_VEHICLE_CONTROL = Lazy.of(() -> new net.minecraft.client.KeyMapping(
"key.maid_useful_tasks.switch_vehicle_control",
InputConstants.Type.KEYSYM,
GLFW.GLFW_KEY_V,
"key.maid_useful_tasks.categories.main"
));
@SubscribeEvent
public static void registerKeyMappings(final RegisterKeyMappingsEvent event) {
event.register(KEY_SWITCH_VEHICLE_CONTROL.get());
}
}

View File

@@ -0,0 +1,20 @@
package studio.fantasyit.maid_useful_task.compat;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.fml.ModList;
public class CompatEntry {
public static BlockPos getLocateTarget(EntityMaid maid, ItemStack itemStack) {
BlockPos tmp = null;
if (tmp == null && ModList.get().isLoaded("naturescompass")) {
tmp = NatureCompass.getCompassTarget(maid, itemStack);
}
if (tmp == null && ModList.get().isLoaded("explorerscompass")) {
tmp = ExplorerCompass.getCompassTarget(maid, itemStack);
}
return tmp;
}
}

View File

@@ -0,0 +1,20 @@
package studio.fantasyit.maid_useful_task.compat;
import com.chaosthedude.explorerscompass.ExplorersCompass;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
public class ExplorerCompass {
public static BlockPos getCompassTarget(EntityMaid maid, ItemStack itemStack) {
if (itemStack.is(ExplorersCompass.explorersCompass)) {
return new BlockPos(
ExplorersCompass.explorersCompass.getFoundStructureX(itemStack),
maid.level().getSeaLevel(),
ExplorersCompass.explorersCompass.getFoundStructureZ(itemStack)
);
}
return null;
}
}

View File

@@ -0,0 +1,21 @@
package studio.fantasyit.maid_useful_task.compat;
import com.chaosthedude.naturescompass.NaturesCompass;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.fml.ModList;
public class NatureCompass {
public static BlockPos getCompassTarget(EntityMaid maid, ItemStack itemStack) {
if (itemStack.is(NaturesCompass.naturesCompass)) {
return new BlockPos(
NaturesCompass.naturesCompass.getFoundBiomeX(itemStack),
maid.level().getSeaLevel(),
NaturesCompass.naturesCompass.getFoundBiomeZ(itemStack)
);
}
return null;
}
}

View File

@@ -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");
}
}

View File

@@ -0,0 +1,5 @@
package studio.fantasyit.maid_useful_task.data;
public interface IConfigSetter {
void setConfigValue(String name, String value);
}

View File

@@ -0,0 +1,26 @@
package studio.fantasyit.maid_useful_task.data;
import com.github.tartaricacid.touhoulittlemaid.api.entity.data.TaskDataKey;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.resources.ResourceLocation;
import oshi.util.tuples.Pair;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
public class MaidConfigKeys {
record keyAndDefSupp<T>(TaskDataKey<T> key, Supplier<T> defaultValue) {
}
public static Map<ResourceLocation, keyAndDefSupp<?>> keys = new HashMap<>();
public static <T> void addKey(ResourceLocation key, TaskDataKey<T> dataKey, Supplier<T> defaultValue) {
keys.put(key, new keyAndDefSupp<>(dataKey, defaultValue));
}
public static <T> T getValue(EntityMaid maid, ResourceLocation key) {
keyAndDefSupp<T> pair = (keyAndDefSupp<T>) keys.get(key);
return maid.getOrCreateData(pair.key, pair.defaultValue.get());
}
}

View File

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

View File

@@ -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);
}
}

View File

@@ -0,0 +1,22 @@
package studio.fantasyit.maid_useful_task.event;
import net.minecraft.server.level.ServerLevel;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import studio.fantasyit.maid_useful_task.MaidUsefulTask;
import studio.fantasyit.maid_useful_task.task.IMaidVehicleControlTask;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleManager;
@Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE)
public class MaidTickEvent {
@SubscribeEvent
public static void onTick(com.github.tartaricacid.touhoulittlemaid.api.event.MaidTickEvent event) {
if (event.getMaid().level() instanceof ServerLevel sl)
if (event.getMaid().getTask() instanceof IMaidVehicleControlTask imvc && event.getMaid().getVehicle() != null) {
imvc.tick(sl, event.getMaid());
MaidVehicleManager.syncVehicleParameter(event.getMaid());
}else if(event.getMaid().getVehicle() != null){
MaidVehicleManager.stopControlling(event.getMaid());
}
}
}

View File

@@ -0,0 +1,75 @@
package studio.fantasyit.maid_useful_task.memory;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.BlockPos;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
public class BlockValidationMemory {
public static final Codec<BlockValidationMemory> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.list(BlockPos.CODEC).fieldOf("validList").forGetter(BlockValidationMemory::getValidList),
Codec.list(BlockPos.CODEC).fieldOf("invalidList").forGetter(BlockValidationMemory::getInvalidList)
).apply(instance, BlockValidationMemory::new)
);
private final Set<BlockPos> validSet = new HashSet<>();
private final Set<BlockPos> invalidSet = new HashSet<>();
public BlockValidationMemory() {
}
public BlockValidationMemory(List<BlockPos> validList, List<BlockPos> invalidList) {
validSet.addAll(validList);
invalidSet.addAll(invalidList);
}
public List<BlockPos> getValidList() {
return List.copyOf(validSet);
}
public List<BlockPos> getInvalidList() {
return List.copyOf(invalidSet);
}
public void setValid(BlockPos blockPos) {
validSet.add(blockPos);
invalidSet.remove(blockPos);
}
public void setInvalid(BlockPos blockPos) {
invalidSet.add(blockPos);
validSet.remove(blockPos);
}
public void remove(BlockPos blockPos) {
validSet.remove(blockPos);
invalidSet.remove(blockPos);
}
public boolean isValid(BlockPos blockPos, boolean defaultValue) {
if (validSet.contains(blockPos)) {
return true;
}
if (invalidSet.contains(blockPos)) {
return false;
}
return defaultValue;
}
public boolean hasRecord(BlockPos blockPos) {
return validSet.contains(blockPos) || invalidSet.contains(blockPos);
}
public void clearFaraway(BlockPos blockPos, int range) {
clearIf(pos->pos.distSqr(blockPos) > range * range);
}
public void clearIf(Predicate<BlockPos> o) {
validSet.removeIf(o);
invalidSet.removeIf(o);
}
}

View File

@@ -0,0 +1,10 @@
package studio.fantasyit.maid_useful_task.memory;
public enum CurrentWork {
IDLE,
PLACE,
DESTROY,
BLOCKUP_UP,
BLOCKUP_DOWN,
BLOCKUP_DESTROY
}

View File

@@ -1,50 +0,0 @@
package studio.fantasyit.maid_useful_task.memory;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
public class TaskRateLimitToken {
public enum Level {
IDLE(0),
L1(1),
L2(2),
L3(3),
L4(4),
L5(5);
private final int level;
Level(int level) {
this.level = level;
}
public int getLevel() {
return level;
}
}
int currentLevel = 0;
int cooldown = 100;
public void tick(EntityMaid maid) {
if (MemoryUtil.getTargetPos(maid) != null) {
currentLevel = 0;
cooldown = 20;
return;
}
if (cooldown > 0) {
cooldown--;
return;
}
currentLevel++;
if (currentLevel > 5) {
currentLevel = 0;
cooldown = 100;
}
}
public boolean isFor(Level level) {
return currentLevel == level.getLevel();
}
}

View File

@@ -0,0 +1,85 @@
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.Config;
import studio.fantasyit.maid_useful_task.data.MaidLoggingConfig;
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 MaidLoggingConfigGui extends MaidTaskConfigGui<MaidLoggingConfigGui.Container> {
private MaidLoggingConfig.Data currentData;
public MaidLoggingConfigGui(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_LOGGING_CONFIG_GUI.get(), id, inventory, entityId);
}
}
@Override
protected void initAdditionData() {
this.currentData = this.maid.getOrCreateData(MaidLoggingConfig.KEY, MaidLoggingConfig.Data.getDefault());
}
@Override
protected void initAdditionWidgets() {
super.initAdditionWidgets();
int startLeft = leftPos + 87;
int startTop = topPos + 36;
this.addRenderableWidget(new MaidConfigButton(startLeft, startTop,
Component.translatable("gui.maid_useful_task.logging.plant"),
TranslateUtil.getBooleanTranslate(this.currentData.plant()),
button -> {
this.currentData.plant(false);
button.setValue(TranslateUtil.getBooleanTranslate(false));
MaidConfigurePacket.send(this.maid, MaidLoggingConfig.LOCATION, "plant", "false");
},
button -> {
this.currentData.plant(true);
button.setValue(TranslateUtil.getBooleanTranslate(true));
MaidConfigurePacket.send(this.maid, MaidLoggingConfig.LOCATION, "plant", "true");
}
));
if (!Config.disableLoggingBlockUp) {
startTop += 13;
this.addRenderableWidget(new MaidConfigButton(startLeft, startTop,
Component.translatable("gui.maid_useful_task.logging.block_up"),
TranslateUtil.getBooleanTranslate(this.currentData.blockUp()),
button -> {
this.currentData.blockUp(false);
button.setValue(TranslateUtil.getBooleanTranslate(false));
MaidConfigurePacket.send(this.maid, MaidLoggingConfig.LOCATION, "blockUp", "false");
},
button -> {
this.currentData.blockUp(true);
button.setValue(TranslateUtil.getBooleanTranslate(true));
MaidConfigurePacket.send(this.maid, MaidLoggingConfig.LOCATION, "blockUp", "true");
}
));
}
startTop += 13;
this.addRenderableWidget(new MaidConfigButton(startLeft, startTop,
Component.translatable("gui.maid_useful_task.logging.skip_non_nature"),
TranslateUtil.getBooleanTranslate(this.currentData.skipNonNature()),
button -> {
this.currentData.skipNonNature(false);
button.setValue(TranslateUtil.getBooleanTranslate(false));
MaidConfigurePacket.send(this.maid, MaidLoggingConfig.LOCATION, "skipNonNature", "false");
},
button -> {
this.currentData.skipNonNature(true);
button.setValue(TranslateUtil.getBooleanTranslate(true));
MaidConfigurePacket.send(this.maid, MaidLoggingConfig.LOCATION, "skipNonNature", "true");
}
));
}
}

View File

@@ -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");
}
));
}
}

View File

@@ -0,0 +1,49 @@
package studio.fantasyit.maid_useful_task.mixin;
import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.task.MaidFollowOwnerTask;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.LivingEntity;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import studio.fantasyit.maid_useful_task.task.MaidLocateTask;
@Mixin(MaidFollowOwnerTask.class)
abstract public class FollowMaidMixin {
@Shadow(remap = false)
@Final
private int stopDistance;
@Inject(method = "Lcom/github/tartaricacid/touhoulittlemaid/entity/ai/brain/task/MaidFollowOwnerTask;checkExtraStartConditions(Lnet/minecraft/server/level/ServerLevel;Lcom/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid;)Z", at = @At("HEAD"),remap = false, cancellable = true)
public void checkExtraStartConditions(ServerLevel level, EntityMaid maid, CallbackInfoReturnable<Boolean> cir) {
if (maid.getTask().getUid().equals(MaidLocateTask.UID)) {
LivingEntity owner = maid.getOwner();
if (owner != null && maid.distanceTo(owner) < 6) {
cir.setReturnValue(false);
}
}
}
@ModifyVariable(method = "start(Lnet/minecraft/server/level/ServerLevel;Lcom/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid;J)V", at = @At(value = "STORE"),remap = false)
public int start(int startDistance, @Local(argsOnly = true) EntityMaid maid) {
if (maid.getTask().getUid().equals(MaidLocateTask.UID)) {
return 10;
}
return startDistance;
}
@ModifyArg(method = "start(Lnet/minecraft/server/level/ServerLevel;Lcom/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid;J)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/ai/behavior/BehaviorUtils;setWalkAndLookTargetMemories(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/Entity;FI)V"))
public int maid_useful_task$stop_distance(int stopDistance, @Local(argsOnly = true) EntityMaid maid) {
if (maid.getTask().getUid().equals(MaidLocateTask.UID)) {
return 10;
}
return stopDistance;
}
}

View File

@@ -6,13 +6,15 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
@Mixin(EntityMaid.class)
public abstract class MaidCheckPickupItem {
@Inject(method = "pickupItem", at = @At("HEAD"), cancellable = true, remap = false)
public void maid_storage_manager$pickupItem(ItemEntity entityItem, boolean simulate, CallbackInfoReturnable<Boolean> cir) {
if (MemoryUtil.getBlockUpContext((EntityMaid) (Object) this).hasTarget()) {
if (!Conditions.isCurrent((EntityMaid) (Object) this, CurrentWork.IDLE)) {
cir.setReturnValue(false);
}
}

View File

@@ -8,6 +8,8 @@ import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import studio.fantasyit.maid_useful_task.task.MaidLocateTask;
import studio.fantasyit.maid_useful_task.task.MaidTreeTask;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
@Mixin(MaidMoveControl.class)
@@ -16,12 +18,14 @@ abstract public class MaidMoveControlMixin {
@Final
private EntityMaid maid;
@Inject(method = "tick", at = @At("HEAD"), remap = false, cancellable = true)
@Inject(method = "tick", at = @At("HEAD"), cancellable = true)
public void tick(CallbackInfo ci) {
if (MemoryUtil.getBlockUpContext(this.maid).hasTarget()) {
if (MemoryUtil.getBlockUpContext(this.maid).isOnLine(this.maid.blockPosition())) {
if (maid.getTask().getUid().equals(MaidTreeTask.UID))
if (switch (MemoryUtil.getCurrent(maid)) {
case BLOCKUP_DESTROY, BLOCKUP_DOWN -> true;
default -> false;
}) {
ci.cancel();
}
}
}
}

View File

@@ -7,13 +7,18 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import studio.fantasyit.maid_useful_task.task.MaidTreeTask;
import studio.fantasyit.maid_useful_task.util.Conditions;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
@Mixin(MaidRunOne.class)
abstract public class MaidRunOneMixin {
@Inject(method = "tryStart(Lnet/minecraft/server/level/ServerLevel;Lcom/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid;J)Z", at = @At("HEAD"), cancellable = true, remap = false)
public void runOne(ServerLevel pLevel, EntityMaid maid, long pGameTime, CallbackInfoReturnable<Boolean> cir) {
if (MemoryUtil.getDestroyTargetMemory(maid) != null || MemoryUtil.getPlaceTarget(maid) != null || MemoryUtil.getBlockUpContext(maid).hasTarget())
cir.setReturnValue(false);
if (maid.getTask().getUid().equals(MaidTreeTask.UID))
if (!Conditions.isCurrent(maid, CurrentWork.IDLE)) {
cir.setReturnValue(false);
}
}
}

View File

@@ -0,0 +1,51 @@
package studio.fantasyit.maid_useful_task.network;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
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;
import java.util.function.Supplier;
public class MaidAllowHandleVehicle {
final int maidId;
public MaidAllowHandleVehicle(EntityMaid maid) {
this.maidId = maid.getId();
}
public MaidAllowHandleVehicle(FriendlyByteBuf buffer) {
maidId = buffer.readInt();
}
public void toBytes(FriendlyByteBuf buffer) {
buffer.writeInt(maidId);
}
public static void handle(MaidAllowHandleVehicle msg, Supplier<NetworkEvent.Context> contextSupplier) {
NetworkEvent.Context context = contextSupplier.get();
ServerPlayer sender = context.getSender();
Entity entity = sender.level().getEntity(msg.maidId);
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");
case ROT_ONLY -> Component.translatable("maid_useful_task.allow_handle_vehicle.rot_only");
case FULL -> Component.translatable("maid_useful_task.allow_handle_vehicle.full");
};
sender.sendSystemMessage(component);
}
}
}

View File

@@ -0,0 +1,56 @@
package studio.fantasyit.maid_useful_task.network;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.network.NetworkEvent;
import org.jetbrains.annotations.Nullable;
import studio.fantasyit.maid_useful_task.data.IConfigSetter;
import studio.fantasyit.maid_useful_task.data.MaidConfigKeys;
import java.util.function.Supplier;
public class MaidConfigurePacket {
final public int maidId;
final public String name;
final public String value;
final public ResourceLocation key;
public MaidConfigurePacket(int maidId, ResourceLocation key, String name, String value) {
this.maidId = maidId;
this.key = key;
this.name = name;
this.value = value;
}
public MaidConfigurePacket(FriendlyByteBuf buffer) {
this.maidId = buffer.readInt();
this.key = ResourceLocation.tryParse(buffer.readUtf());
this.name = buffer.readUtf();
this.value = buffer.readUtf();
}
public void toBytes(FriendlyByteBuf buffer) {
buffer.writeInt(maidId);
buffer.writeUtf(key.toString());
buffer.writeUtf(name);
buffer.writeUtf(value);
}
public static void handle(MaidConfigurePacket msg, Supplier<NetworkEvent.Context> contextSupplier) {
NetworkEvent.Context context = contextSupplier.get();
@Nullable ServerPlayer sender = context.getSender();
if (sender != null) {
if (sender.level().getEntity(msg.maidId) instanceof EntityMaid entityMaid) {
if (MaidConfigKeys.getValue(entityMaid, msg.key) instanceof IConfigSetter ics) {
ics.setConfigValue(msg.name, msg.value);
}
}
}
}
public static void send(EntityMaid maid, ResourceLocation key, String name, String value) {
Network.INSTANCE.sendToServer(new MaidConfigurePacket(maid.getId(), key, name, value));
}
}

View File

@@ -0,0 +1,44 @@
package studio.fantasyit.maid_useful_task.network;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
import net.minecraftforge.network.NetworkEvent;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleManager;
import java.util.function.Supplier;
public class MaidSyncVehiclePacket {
final CompoundTag tag;
final int maidId;
public MaidSyncVehiclePacket(int maidId, CompoundTag tag) {
this.maidId = maidId;
this.tag = tag;
}
public MaidSyncVehiclePacket(FriendlyByteBuf buffer) {
this.maidId = buffer.readInt();
this.tag = buffer.readNbt();
}
public void toBytes(FriendlyByteBuf buffer) {
buffer.writeInt(maidId);
buffer.writeNbt(tag);
}
public static void handle(MaidSyncVehiclePacket msg, Supplier<NetworkEvent.Context> contextSupplier) {
NetworkEvent.Context context = contextSupplier.get();
Entity entity = Network.getLocalPlayer().level().getEntity(msg.maidId);
if (entity instanceof EntityMaid maid) {
MaidVehicleManager.getControllableVehicle(maid).ifPresent(vehicle -> {
vehicle.syncVehicleParameter(maid, msg.tag);
});
}
}
}

View File

@@ -0,0 +1,76 @@
package studio.fantasyit.maid_useful_task.network;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
import studio.fantasyit.maid_useful_task.MaidUsefulTask;
public class Network {
private static final String PROTOCOL_VERSION = "1";
public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(
new ResourceLocation(MaidUsefulTask.MODID, "mut_packets"),
() -> PROTOCOL_VERSION,
(v) -> true,
(v) -> true
);
private static void registerMessage() {
Network.INSTANCE.registerMessage(0,
MaidConfigurePacket.class,
MaidConfigurePacket::toBytes,
MaidConfigurePacket::new,
(msg, context) -> {
context.get().enqueueWork(() -> MaidConfigurePacket.handle(msg, context));
context.get().setPacketHandled(true);
}
);
Network.INSTANCE.registerMessage(1,
MaidAllowHandleVehicle.class,
MaidAllowHandleVehicle::toBytes,
MaidAllowHandleVehicle::new,
(msg, context) -> {
context.get().enqueueWork(() -> MaidAllowHandleVehicle.handle(msg, context));
context.get().setPacketHandled(true);
}
);
Network.INSTANCE.registerMessage(2,
MaidSyncVehiclePacket.class,
MaidSyncVehiclePacket::toBytes,
MaidSyncVehiclePacket::new,
(msg, context) -> {
context.get().enqueueWork(() -> MaidSyncVehiclePacket.handle(msg, context));
context.get().setPacketHandled(true);
}
);
}
@OnlyIn(Dist.CLIENT)
public static Player getLocalPlayer() {
return Minecraft.getInstance().player;
}
@Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.DEDICATED_SERVER)
public static class Server {
@SubscribeEvent
public static void FMLClientSetupEvent(FMLDedicatedServerSetupEvent event) {
registerMessage();
}
}
@Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
public static class Client {
@SubscribeEvent
public static void FMLClientSetupEvent(FMLClientSetupEvent event) {
registerMessage();
}
}
}

View File

@@ -0,0 +1,23 @@
package studio.fantasyit.maid_useful_task.registry;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.eventbus.api.SubscribeEvent;
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 {
@SubscribeEvent
public static void init(FMLClientSetupEvent event) {
event.enqueueWork(() -> {
MenuScreens.register(GuiRegistry.MAID_LOGGING_CONFIG_GUI.get(), MaidLoggingConfigGui::new);
});
event.enqueueWork(() -> {
MenuScreens.register(GuiRegistry.MAID_REVIVE_CONFIG_GUI.get(), MaidReviveConfigGui::new);
});
}
}

View File

@@ -0,0 +1,23 @@
package studio.fantasyit.maid_useful_task.registry;
import net.minecraft.world.inventory.MenuType;
import net.minecraftforge.common.extensions.IForgeMenuType;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
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);
}
}

View File

@@ -3,13 +3,14 @@ package studio.fantasyit.maid_useful_task.registry;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.RegistryObject;
import studio.fantasyit.maid_useful_task.MaidUsefulTask;
import studio.fantasyit.maid_useful_task.memory.BlockTargetMemory;
import studio.fantasyit.maid_useful_task.memory.BlockUpContext;
import studio.fantasyit.maid_useful_task.memory.TaskRateLimitToken;
import studio.fantasyit.maid_useful_task.memory.*;
import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
import java.util.Optional;
@@ -22,9 +23,13 @@ public class MemoryModuleRegistry {
= REGISTER.register("place_target", () -> new MemoryModuleType<>(Optional.empty()));
public static final RegistryObject<MemoryModuleType<BlockUpContext>> BLOCK_UP_TARGET
= REGISTER.register("block_up", () -> new MemoryModuleType<>(Optional.of(BlockUpContext.CODEC)));
public static final RegistryObject<MemoryModuleType<TaskRateLimitToken>> RATE_LIMIT_TOKEN
= REGISTER.register("task_rate_limit", () -> new MemoryModuleType<>(Optional.empty()));
public static final RegistryObject<MemoryModuleType<BlockValidationMemory>> BLOCK_VALIDATION
= REGISTER.register("block_validation", () -> new MemoryModuleType<>(Optional.of(BlockValidationMemory.CODEC)));
public static final RegistryObject<MemoryModuleType<BlockPos>> COMMON_BLOCK_CACHE
= REGISTER.register("common_block_cache", () -> new MemoryModuleType<>(Optional.empty()));
public static final RegistryObject<MemoryModuleType<ItemStack>> LOCATE_ITEM = REGISTER.register("locate_item", () -> new MemoryModuleType<>(Optional.empty()));
public static final RegistryObject<MemoryModuleType<CurrentWork>> CURRENT_WORK = REGISTER.register("current_work", () -> new MemoryModuleType<>(Optional.empty()));
public static final RegistryObject<MemoryModuleType<MaidVehicleControlType>> IS_ALLOW_HANDLE_VEHICLE = REGISTER.register("is_allow_handle_vehicle", () -> new MemoryModuleType<>(Optional.empty()));
public static void register(IEventBus eventBus) {
REGISTER.register(eventBus);
}

View File

@@ -3,21 +3,14 @@ package studio.fantasyit.maid_useful_task.task;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.mojang.datafixers.util.Pair;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.ai.behavior.BehaviorControl;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.BaseFireBlock;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import studio.fantasyit.maid_useful_task.behavior.DestoryBlockBehavior;
import studio.fantasyit.maid_useful_task.behavior.DestoryBlockMoveBehavior;
import studio.fantasyit.maid_useful_task.behavior.common.DestoryBlockBehavior;
import studio.fantasyit.maid_useful_task.behavior.common.DestoryBlockMoveBehavior;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
@@ -69,8 +62,9 @@ public interface IMaidBlockDestroyTask {
for (int dz : dv) {
if (dx == 0 && dy == 0 && dz == 0) continue;
BlockPos target = pos.offset(dx, dy, dz);
if (Math.abs(target.getX() - standPos.getX()) > maxDXZ || Math.abs(target.getZ() - standPos.getZ()) > maxDXZ)
continue;
// if (Math.abs(target.getX() - standPos.getX()) > maxDXZ || Math.abs(target.getZ() - standPos.getZ()) > maxDXZ)
// continue;
//上代码不明所以,删除待查
if (target.distSqr(standPos) > reachDistance() * reachDistance()) continue;
if (marked.contains(target)) continue;
if (!shouldDestroyBlock(maid, target)) continue;

View File

@@ -3,19 +3,12 @@ package studio.fantasyit.maid_useful_task.task;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.mojang.datafixers.util.Pair;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.ai.behavior.BehaviorControl;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.ClipContext;
import net.minecraft.world.phys.BlockHitResult;
import org.jetbrains.annotations.NotNull;
import studio.fantasyit.maid_useful_task.behavior.DestoryBlockBehavior;
import studio.fantasyit.maid_useful_task.behavior.DestoryBlockMoveBehavior;
import studio.fantasyit.maid_useful_task.behavior.common.DestoryBlockBehavior;
import studio.fantasyit.maid_useful_task.behavior.common.DestoryBlockMoveBehavior;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
import java.util.List;

View File

@@ -3,14 +3,18 @@ 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.github.tartaricacid.touhoulittlemaid.entity.passive.MaidPathFindingBFS;
import com.github.tartaricacid.touhoulittlemaid.util.CenterOffsetBlockPosSet;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import oshi.util.tuples.Pair;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
import studio.fantasyit.maid_useful_task.util.PosUtils;
import java.util.function.Function;
public interface IMaidBlockUpTask {
default boolean isFindingBlock(EntityMaid maid, BlockPos target, BlockPos standPos) {
if (target.distSqr(standPos) > touchLimit() * touchLimit())
@@ -27,7 +31,6 @@ public interface IMaidBlockUpTask {
for (int dz = 0; dz < touchLimit(); dz = dz <= 0 ? 1 - dz : -dz) {
for (int dy = 0; dy < verticalDistance(); dy++) {
BlockPos targetPos = startPos.offset(dx, dy, dz);
if (maid.hasRestriction() && !maid.isWithinRestriction(targetPos)) break;
if (isFindingBlock(maid, targetPos, startPos)) {
return true;
}
@@ -37,55 +40,87 @@ public interface IMaidBlockUpTask {
return false;
}
default Pair<BlockPos, BlockPos> findTargetPosBlockUp(EntityMaid maid, BlockPos center) {
default Pair<BlockPos, BlockPos> findTargetPosBlockUp(EntityMaid maid, BlockPos center, int maxUp) {
ServerLevel level = (ServerLevel) maid.level();
MaidPathFindingBFS pathFindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), level, maid);
for (int dx = 0; dx < scanRange(); dx = dx <= 0 ? 1 - dx : -dx) {
for (int dz = 0; dz < scanRange(); dz = dz <= 0 ? 1 - dz : -dz) {
BlockPos.MutableBlockPos mb = center.offset(dx, 0, dz).mutable();
while (level.getBlockState(mb).canBeReplaced()) mb.move(0, -1, 0);
while (!level.getBlockState(mb).canBeReplaced()) mb.move(0, 1, 0);
if (!PosUtils.isFourSideAir(level, mb)) continue;
if (!pathFindingBFS.canPathReach(mb)) continue;
int maxHeight = verticalOffset() + verticalDistance();
boolean hasRestriction = maid.hasRestriction();
BlockPos restrictCenter = maid.getRestrictCenter();
float restrictRadius = maid.getRestrictRadius();
int scanRange = scanRange(maid);
Function<BlockPos, Boolean> withinRestriction = (BlockPos pos) -> {
if (hasRestriction) {
return restrictCenter.distSqr(pos) < (double) (restrictRadius * restrictRadius);
} else {
return true;
}
};
CenterOffsetBlockPosSet notAvailable = new CenterOffsetBlockPosSet(scanRange, scanRange + maxHeight / 2 + 1, scanRange, center.getX(), center.getY() + maxHeight / 2, center.getZ());
MaidPathFindingBFS pathFindingBFS = new MaidPathFindingBFS(maid.getNavigation().getNodeEvaluator(), level, maid, 7, scanRange+2);
for (int dx = 0; dx < scanRange; dx = dx <= 0 ? 1 - dx : -dx) {
for (int dz = 0; dz < scanRange; dz = dz <= 0 ? 1 - dz : -dz) {
//计算地面的位置
BlockPos.MutableBlockPos ground = center.offset(dx, 0, dz).mutable();
while (level.getBlockState(ground).canBeReplaced()) ground.move(0, -1, 0);
while (!level.getBlockState(ground).canBeReplaced()) ground.move(0, 1, 0);
if (notAvailable.isVis(ground)) continue;
//地面基本判断
if (!PosUtils.isSafePos(level, ground)) continue;
if (!PosUtils.isFourSideAir(level, ground.immutable())) continue;
if (!pathFindingBFS.canPathReach(ground)) continue;
boolean valid = true;
for (int dy = 0; dy < verticalOffset(); dy++) {
BlockPos targetPos = center.offset(dx, dy, dz);
BlockPos targetPos = ground.above(dy);
if (!level.getBlockState(targetPos).canBeReplaced()) {
valid = false;
break;
}
}
for (int dy = verticalDistance(); dy < verticalDistance() + 2; dy++) {
BlockPos targetPos = center.offset(dx, dy, dz);
for (int dy = verticalOffset(); dy < verticalOffset() + 2; dy++) {
BlockPos targetPos = ground.above(dy);
if (!level.getBlockState(targetPos).isAir()) {
valid = false;
break;
}
}
if (!valid)
if (!valid) {
notAvailable.markVis(ground.immutable());
continue;
int touchLimit = touchLimit() + 1;
boolean continuous = true;
BlockPos standPos = center.offset(dx, verticalOffset(), dz);
for (int dy = verticalOffset(); dy < verticalDistance() + verticalOffset(); dy++) {
BlockPos targetPos = center.offset(dx, dy, dz);
if (maid.hasRestriction() && !maid.isWithinRestriction(targetPos)) break;
if (isFindingBlock(maid, targetPos, standPos)) {
return new Pair<>(mb, standPos);
}
//头顶一格是不是空气,不是:不连续空间(不能继续垫了,那么需要计算触及范围
if (!level.getBlockState(standPos.above().above()).isAir()) {
continuous = false;
}
if (!continuous) {
touchLimit--;
} else {
standPos = standPos.above();
}
if (touchLimit <= 0)
break;
}
//竖直方向触及
for (int sdx = 0; sdx < 2; sdx = sdx <= 0 ? 1 - sdx : -sdx)
for (int sdz = 0; sdz < 2; sdz = sdz <= 0 ? 1 - sdz : -sdz) {
int touchLimit = touchLimit() + 1;
boolean continuous = true;
BlockPos standPos = ground.above(verticalOffset()).offset(sdx, 0, sdz);
if (standPos.getY() - ground.getY() > maxUp)
continue;
for (int dy = verticalOffset(); dy < verticalDistance() + verticalOffset(); dy++) {
BlockPos targetPos = ground.offset(sdx, dy, sdz);
if (targetPos.distSqr(standPos) > touchLimit * touchLimit) break;
if (hasRestriction && !withinRestriction.apply(standPos)) break;
if (isFindingBlock(maid, targetPos, standPos)) {
return new Pair<>(ground.immutable(), standPos);
}
//头顶一格是不是空气,不是:不连续空间(不能继续垫了,那么需要计算触及范围
if (continuous) {
if (!level.getBlockState(standPos.above().above()).isAir()) {
continuous = false;
} else if (hasRestriction && !withinRestriction.apply((standPos.above().above()))) {
continuous = false;
}
}
if (!continuous) {
touchLimit--;
} else {
standPos = standPos.above();
if (standPos.getY() - ground.getY() > maxUp)
break;
}
if (touchLimit <= 0)
break;
}
}
}
}
return null;
@@ -97,7 +132,7 @@ public interface IMaidBlockUpTask {
for (int i = 0; i < inv.getSlots(); i++) {
ItemStack stack = inv.getStackInSlot(i);
if (isValidItemStack(maid, stack)) {
count++;
count += stack.getCount();
}
}
return count;
@@ -141,11 +176,19 @@ public interface IMaidBlockUpTask {
return 15;
}
default int scanRange() {
return 10;
default int scanRange(EntityMaid maid) {
return maid.hasRestriction() ? (int) maid.getRestrictRadius() : 15;
}
default int touchLimit() {
return 7;
}
default boolean tryPlaceBlockUp(EntityMaid maid, BlockPos targetPos) {
return MaidUtils.placeBlock(maid, targetPos);
}
default boolean tryDestroyBlockUp(EntityMaid maid, BlockPos targetPos) {
return MaidUtils.destroyBlock(maid, targetPos);
}
}

View File

@@ -0,0 +1,24 @@
package studio.fantasyit.maid_useful_task.task;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import org.jetbrains.annotations.Nullable;
public interface IMaidFindTargetTask extends IMaidVehicleControlTask {
@Nullable BlockPos findTarget(ServerLevel level, EntityMaid maid);
void clearCache(EntityMaid maid);
default int maxOutDistance() {
return 10;
}
default int minReScheduleDistance() {
return 3;
}
default int moveDistance() {
return 10;
}
}

View File

@@ -0,0 +1,25 @@
package studio.fantasyit.maid_useful_task.task;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleManager;
public interface IMaidVehicleControlTask {
BlockPos findTarget(ServerLevel level, EntityMaid maid);
default void tick(ServerLevel level, EntityMaid maid) {
MaidVehicleControlType allowHandleVehicle = MemoryUtil.getAllowHandleVehicle(maid);
BlockPos targetPos = findTarget(level, maid);
MaidVehicleManager.getControllableVehicle(maid).ifPresent(vehicle -> {
if (targetPos == null) {
vehicle.maidStopControlVehicle(maid);
} else {
vehicle.maidControlVehicle(maid, allowHandleVehicle, targetPos);
}
});
}
}

View File

@@ -0,0 +1,172 @@
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.core.BlockPos;
import net.minecraft.core.GlobalPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.StructureTags;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.behavior.BehaviorControl;
import net.minecraft.world.item.CompassItem;
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.MapItemSavedData;
import net.minecraftforge.common.MinecraftForge;
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.api.ItemLocateEvent;
import studio.fantasyit.maid_useful_task.behavior.common.FindTargetMoveBehavior;
import studio.fantasyit.maid_useful_task.behavior.common.FindTargetWaitBehavior;
import studio.fantasyit.maid_useful_task.compat.CompatEntry;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import java.util.ArrayList;
import java.util.List;
public class MaidLocateTask implements IMaidTask, IMaidFindTargetTask {
public static final ResourceLocation UID = new ResourceLocation(MaidUsefulTask.MODID, "locate");
@Override
public ResourceLocation getUid() {
return UID;
}
@Override
public ItemStack getIcon() {
return Items.ENDER_EYE.getDefaultInstance();
}
@Nullable
@Override
public SoundEvent getAmbientSound(EntityMaid entityMaid) {
return null;
}
@Override
public List<Pair<Integer, BehaviorControl<? super EntityMaid>>> createBrainTasks(EntityMaid entityMaid) {
List<Pair<Integer, BehaviorControl<? super EntityMaid>>> list = new ArrayList<>();
list.add(Pair.of(1, new FindTargetMoveBehavior()));
list.add(Pair.of(2, new FindTargetWaitBehavior()));
return list;
}
@Override
public boolean enableLookAndRandomWalk(EntityMaid maid) {
return false;
}
@Override
public boolean isEnable(EntityMaid maid) {
return Config.enableLocateTask;
}
@Override
public @Nullable BlockPos findTarget(ServerLevel level, EntityMaid maid) {
BlockPos target = null;
ItemStack itemStack = maid.getMainHandItem();
ItemStack last = MemoryUtil.getLocateItem(maid);
if (!last.isEmpty() && !itemStack.isEmpty() && ItemStack.isSameItemSameTags(last, itemStack)) {
MemoryUtil.setLocateItem(maid, itemStack);
MemoryUtil.clearCommonBlockCache(maid);
}
ItemLocateEvent event = new ItemLocateEvent(itemStack, maid, MemoryUtil.getCommonBlockCache(maid));
if (MinecraftForge.EVENT_BUS.post(event)) {
target = event.getTarget();
} else if (maid.getMainHandItem().is(Items.ENDER_EYE)) {
target = MemoryUtil.getCommonBlockCache(maid);
if (target == null) {
BlockPos blockpos = level.findNearestMapStructure(StructureTags.EYE_OF_ENDER_LOCATED, maid.blockPosition(), 100, false);
if (blockpos != null) {
MemoryUtil.setCommonBlockCache(maid, blockpos);
target = blockpos;
}
}
} else if (maid.getMainHandItem().is(Items.COMPASS)) {
target = MemoryUtil.getCommonBlockCache(maid);
if (target == null) {
GlobalPos globalPos;
if (CompassItem.isLodestoneCompass(itemStack)) {
globalPos = CompassItem.getLodestonePosition(itemStack.getOrCreateTag());
} else {
globalPos = CompassItem.getSpawnPosition(level);
}
if (globalPos != null && level.dimension().equals(globalPos.dimension())) {
MemoryUtil.setCommonBlockCache(maid, globalPos.pos());
target = globalPos.pos();
}
}
} else if (maid.getMainHandItem().is(ItemTags.BEDS)) {
target = MemoryUtil.getCommonBlockCache(maid);
if (target == null) {
LivingEntity owner = maid.getOwner();
if (owner instanceof ServerPlayer player) {
if (player.getRespawnDimension().equals(level.dimension())) {
target = player.getRespawnPosition();
if (target == null) {
GlobalPos globalRespawn = CompassItem.getSpawnPosition(level);
if (globalRespawn != null && level.dimension().equals(globalRespawn.dimension())) {
target = globalRespawn.pos();
}
}
}
if (target == null) {
MemoryUtil.setCommonBlockCache(maid, target);
}
}
}
} 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 {
target = CompatEntry.getLocateTarget(maid, maid.getMainHandItem());
if (target != null) {
MemoryUtil.setCommonBlockCache(maid, target);
return target;
}
MemoryUtil.clearCommonBlockCache(maid);
}
return target;
}
@Override
public void clearCache(EntityMaid maid) {
MemoryUtil.clearCommonBlockCache(maid);
}
}

View File

@@ -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;
}
}

View File

@@ -0,0 +1,83 @@
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.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()));
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());
}
};
}
}

View File

@@ -4,13 +4,18 @@ 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.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.InteractionHand;
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 net.minecraft.world.level.block.LeavesBlock;
@@ -18,17 +23,27 @@ 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.*;
import studio.fantasyit.maid_useful_task.behavior.common.*;
import studio.fantasyit.maid_useful_task.data.MaidLoggingConfig;
import studio.fantasyit.maid_useful_task.memory.BlockValidationMemory;
import studio.fantasyit.maid_useful_task.menu.MaidLoggingConfigGui;
import studio.fantasyit.maid_useful_task.util.MaidUtils;
import studio.fantasyit.maid_useful_task.util.MemoryUtil;
import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockDestroyTask, IMaidBlockUpTask {
public static final ResourceLocation UID = new ResourceLocation(MaidUsefulTask.MODID, "maid_tree");
@Override
public ResourceLocation getUid() {
return new ResourceLocation(MaidUsefulTask.MODID, "maid_tree");
return UID;
}
@Override
@@ -47,14 +62,47 @@ 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() {
@Override
public Component getDisplayName() {
return Component.literal("");
}
@Override
public AbstractContainerMenu createMenu(int index, Inventory playerInventory, Player player) {
return new MaidLoggingConfigGui.Container(index, playerInventory, maid.getId());
}
};
}
@Override
public boolean shouldDestroyBlock(EntityMaid maid, BlockPos pos) {
if (MemoryUtil.getBlockUpContext(maid).hasTarget()) {
if (pos.getY() < maid.getBlockY() && pos.getX() == maid.getBlockX() && pos.getZ() == maid.getBlockZ()) {
return false;
}
}
BlockState blockState = maid.level().getBlockState(pos);
return blockState.is(BlockTags.LOGS) && isValidNatureTree(maid, pos);
if (blockState.is(BlockTags.LOGS)) {
return !MaidLoggingConfig.get(maid).skipNonNature() || isValidNatureTree(maid, pos);
}
return false;
}
@Override
public boolean mayDestroy(EntityMaid maid, BlockPos pos) {
if (MemoryUtil.getBlockUpContext(maid).hasTarget()) {
if (pos.getY() < maid.getBlockY() && pos.getX() == maid.getBlockX() && pos.getZ() == maid.getBlockZ()) {
return false;
}
}
BlockState blockState = maid.level().getBlockState(pos);
if (blockState.is(BlockTags.LEAVES)) {
return true;
@@ -64,6 +112,7 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
@Override
public boolean shouldPlaceItemStack(EntityMaid maid, ItemStack itemStack) {
if (!maid.getOrCreateData(MaidLoggingConfig.KEY, MaidLoggingConfig.Data.getDefault()).plant()) return false;
return itemStack.is(ItemTags.SAPLINGS);
}
@@ -102,7 +151,7 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
CombinedInvWrapper inv = maid.getAvailableInv(true);
int target = -1;
for (int i = 0; i < inv.getSlots(); i++) {
if (inv.getStackInSlot(i).is(Items.SHEARS)) {
if (inv.getStackInSlot(i).is(Items.SHEARS) || inv.getStackInSlot(i).is(ItemTags.HOES)) {
target = i;
break;
}
@@ -133,34 +182,69 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
return IMaidBlockDestroyTask.super.availableToGetDrop(maid, fakePlayer, pos, targetBlockState);
}
protected boolean isValidNatureTree(EntityMaid maid, BlockPos startPos) {
HashSet<BlockPos> vis = new HashSet<>();
BlockValidationMemory validationMemory = MemoryUtil.getBlockValidationMemory(maid);
boolean validNatureTree = isValidNatureTree(maid, startPos, vis, 0, validationMemory);
for (BlockPos pos : vis) {
BlockState blockState = maid.level().getBlockState(pos);
if (!blockState.is(BlockTags.LEAVES) && !blockState.is(BlockTags.LOGS))
continue;
if (validNatureTree)
validationMemory.setValid(pos);
else
validationMemory.setInvalid(pos);
}
return validNatureTree;
}
protected boolean isValidNatureTree(EntityMaid maid, BlockPos startPos, Set<BlockPos> visited, int depth, BlockValidationMemory validationMemory) {
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};
for (int dx : dv) {
for (int dz : dv) {
for (int dy = 0; dy < 6; dy++) {
BlockState blockState = maid.level().getBlockState(startPos.offset(dx, dy, dz));
if (blockState.is(BlockTags.LEAVES) && !blockState.getValue(LeavesBlock.PERSISTENT)) {
return true;
for (int dy : dv) {
BlockPos offset = startPos.offset(dx, dy, dz);
BlockState blockState = maid.level().getBlockState(offset);
if (blockState.is(BlockTags.LEAVES) && blockState.hasProperty(LeavesBlock.PERSISTENT) && !blockState.getValue(LeavesBlock.PERSISTENT)) {
valid = true;
}
if (blockState.is(BlockTags.LOGS) && isValidNatureTree(maid, offset, visited, depth + 1, validationMemory)) {
valid = true;
}
}
}
}
return false;
if (valid)
validationMemory.setValid(startPos);
else
validationMemory.setInvalid(startPos);
return valid;
}
@Override
public List<Pair<Integer, BehaviorControl<? super EntityMaid>>> createBrainTasks(EntityMaid entityMaid) {
ArrayList<Pair<Integer, BehaviorControl<? super EntityMaid>>> list = new ArrayList<>();
list.add(Pair.of(6, new LoopWithTokenBehavior()));
list.add(Pair.of(0, new MaidSelfRescueBehavior()));
list.add(Pair.of(1, new DestoryBlockBehavior()));
list.add(Pair.of(1, new DestoryBlockMoveBehavior()));
list.add(Pair.of(2, new BlockUpScheduleBehavior()));
list.add(Pair.of(2, new BlockUpPlaceBehavior()));
list.add(Pair.of(2, new BlockUpDestroyBehavior()));
list.add(Pair.of(5, new DestoryBlockBehavior()));
list.add(Pair.of(4, new DestoryBlockMoveBehavior()));
list.add(Pair.of(3, new PlaceBlockBehavior()));
list.add(Pair.of(2, new PlaceBlockMoveBehavior()));
list.add(Pair.of(3, new PlaceBlockMoveBehavior()));
list.add(Pair.of(1, new BlockUpScheduleBehavior()));
list.add(Pair.of(0, new BlockUpPlaceBehavior()));
list.add(Pair.of(0, new BlockUpDestroyBehavior()));
list.add(Pair.of(4, new UpdateValidationMemoryBehavior()));
return list;
}
@@ -179,6 +263,47 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
public boolean isFindingBlock(EntityMaid maid, BlockPos target, BlockPos standPos) {
if (target.distSqr(standPos) > touchLimit() * touchLimit())
return false;
return maid.level().getBlockState(target).is(BlockTags.LOGS) && isValidNatureTree(maid, target);
if (maid.level().getBlockState(target).is(BlockTags.LOGS)) {
return !MaidLoggingConfig.get(maid).skipNonNature() || isValidNatureTree(maid, target);
}
return false;
}
}
@Override
public boolean tryDestroyBlockUp(EntityMaid maid, BlockPos targetPos) {
return tryDestroyBlock(maid, targetPos);
}
@Override
public boolean tryPlaceBlock(EntityMaid maid, BlockPos pos) {
if (IMaidBlockPlaceTask.super.tryPlaceBlock(maid, pos)) {
MemoryUtil.getBlockValidationMemory(maid).setValid(pos);
return true;
}
return false;
}
@Override
public boolean tryDestroyBlock(EntityMaid maid, BlockPos blockPos) {
if (MaidUtils.destroyBlock(maid, blockPos)) {
MemoryUtil.getBlockValidationMemory(maid).remove(blockPos);
return true;
}
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() && MaidLoggingConfig.get(maid).blockUp() && !Config.disableLoggingBlockUp)
return IMaidBlockUpTask.super.findTargetPosBlockUp(maid, center, maxUp);
return null;
}
}

View File

@@ -7,13 +7,13 @@ import net.minecraft.world.entity.ai.Brain;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.entity.ai.memory.WalkTarget;
import net.minecraft.world.phys.Vec3;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.memory.CurrentWork;
import java.util.Optional;
public class Conditions {
public static boolean hasReachedValidTargetOrReset(EntityMaid maid) {
return hasReachedValidTargetOrReset(maid, 2);
return hasReachedValidTargetOrReset(maid, 2.5f);
}
public static boolean hasReachedValidTargetOrReset(EntityMaid maid, float closeEnough) {
@@ -24,6 +24,7 @@ public class Conditions {
Optional<WalkTarget> walkTarget = brain.getMemory(MemoryModuleType.WALK_TARGET);
if (walkTarget.isEmpty() || !walkTarget.get().getTarget().currentPosition().equals(targetV3d)) {
brain.eraseMemory(InitEntities.TARGET_POS.get());
MemoryUtil.setCurrent(maid, CurrentWork.IDLE);
}
return false;
}
@@ -41,10 +42,12 @@ public class Conditions {
public static boolean isGlobalValidTarget(EntityMaid maid, BlockPos pos, BlockPos targetPos) {
if (MemoryUtil.getBlockUpContext(maid).hasTarget()) {
if (targetPos.getY() < maid.getBlockY() && targetPos.getX() == maid.getBlockX() && targetPos.getZ() == maid.getBlockZ())
return false;
return MemoryUtil.getBlockUpContext(maid).isTarget(pos);
return pos.equals(maid.blockPosition());
}
return true;
}
public static boolean isCurrent(EntityMaid maid, CurrentWork currentWork) {
return MemoryUtil.getCurrent(maid) == currentWork;
}
}

View File

@@ -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;
}
}

View File

@@ -37,7 +37,27 @@ public class MaidUtils {
}
}
}
public static boolean destroyBlock(EntityMaid maid, BlockPos blockPos){
public static float getDestroyProgressDelta(EntityMaid maid, BlockPos blockPos) {
WrappedMaidFakePlayer fakePlayer = WrappedMaidFakePlayer.get(maid);
BlockState blockState = maid.level().getBlockState(blockPos);
return blockState.getDestroyProgress(fakePlayer, maid.level(), blockPos);
}
public static BlockPos getMaidRestrictCenter(EntityMaid maid) {
if (MemoryUtil.getBlockUpContext(maid).hasTarget()) {
return MemoryUtil.getBlockUpContext(maid).getTargetPos();
}
if (maid.hasRestriction())
return maid.getRestrictCenter();
return maid.blockPosition();
}
public static boolean destroyBlock(EntityMaid maid, BlockPos blockPos) {
WrappedMaidFakePlayer fakePlayer = WrappedMaidFakePlayer.get(maid);
maid.getMainHandItem().hurtAndBreak(1, fakePlayer, (p_186374_) -> {
p_186374_.broadcastBreakEvent(InteractionHand.MAIN_HAND);
});
ServerLevel level = (ServerLevel) maid.level();
BlockState blockState = level.getBlockState(blockPos);
if (blockState.isAir()) {
@@ -62,7 +82,7 @@ public class MaidUtils {
}
public static boolean placeBlock(EntityMaid maid, BlockPos pos) {
Player fakePlayer = WrappedMaidFakePlayer.get(maid);
WrappedMaidFakePlayer fakePlayer = WrappedMaidFakePlayer.get(maid);
BlockHitResult result = null;
ClipContext rayTraceContext = new ClipContext(maid.getPosition(0).add(0, maid.getEyeHeight(), 0),
pos.getCenter(),

View File

@@ -5,14 +5,15 @@ import com.github.tartaricacid.touhoulittlemaid.init.InitEntities;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ai.Brain;
import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
import net.minecraft.world.entity.ai.behavior.BlockPosTracker;
import net.minecraft.world.entity.ai.behavior.PositionTracker;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.Nullable;
import studio.fantasyit.maid_useful_task.memory.BlockTargetMemory;
import studio.fantasyit.maid_useful_task.memory.BlockUpContext;
import studio.fantasyit.maid_useful_task.memory.TaskRateLimitToken;
import studio.fantasyit.maid_useful_task.memory.*;
import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
import java.util.List;
import java.util.Optional;
@@ -22,6 +23,7 @@ public class MemoryUtil {
Optional<BlockTargetMemory> memory = maid.getBrain().getMemory(MemoryModuleRegistry.DESTROY_TARGET.get());
return memory.orElse(null);
}
public static void setDestroyTargetMemory(EntityMaid maid, List<BlockPos> blockPosSet) {
maid.getBrain().setMemory(MemoryModuleRegistry.DESTROY_TARGET.get(), new BlockTargetMemory(blockPosSet));
}
@@ -44,9 +46,11 @@ public class MemoryUtil {
Optional<BlockPos> memory = maid.getBrain().getMemory(MemoryModuleRegistry.PLACE_TARGET.get());
return memory.orElse(null);
}
public static void setPlaceTarget(EntityMaid maid, BlockPos blockPos) {
maid.getBrain().setMemory(MemoryModuleRegistry.PLACE_TARGET.get(), blockPos);
}
public static void clearPlaceTarget(EntityMaid maid) {
maid.getBrain().eraseMemory(MemoryModuleRegistry.PLACE_TARGET.get());
}
@@ -55,19 +59,59 @@ public class MemoryUtil {
maid.getBrain().setMemory(MemoryModuleType.LOOK_TARGET, new BlockPosTracker(pos));
}
public static BlockUpContext getBlockUpContext(EntityMaid maid){
public static BlockUpContext getBlockUpContext(EntityMaid maid) {
Brain<EntityMaid> brain = maid.getBrain();
if(!brain.hasMemoryValue(MemoryModuleRegistry.BLOCK_UP_TARGET.get())){
if (!brain.hasMemoryValue(MemoryModuleRegistry.BLOCK_UP_TARGET.get())) {
brain.setMemory(MemoryModuleRegistry.BLOCK_UP_TARGET.get(), new BlockUpContext());
}
return brain.getMemory(MemoryModuleRegistry.BLOCK_UP_TARGET.get()).get();
}
public static TaskRateLimitToken getRateLimitToken(EntityMaid maid){
public static BlockValidationMemory getBlockValidationMemory(EntityMaid maid) {
Brain<EntityMaid> brain = maid.getBrain();
if(!brain.hasMemoryValue(MemoryModuleRegistry.RATE_LIMIT_TOKEN.get())){
brain.setMemory(MemoryModuleRegistry.RATE_LIMIT_TOKEN.get(), new TaskRateLimitToken());
if (!brain.hasMemoryValue(MemoryModuleRegistry.BLOCK_VALIDATION.get())) {
brain.setMemory(MemoryModuleRegistry.BLOCK_VALIDATION.get(), new BlockValidationMemory());
}
return brain.getMemory(MemoryModuleRegistry.RATE_LIMIT_TOKEN.get()).get();
return brain.getMemory(MemoryModuleRegistry.BLOCK_VALIDATION.get()).get();
}
public static void setTarget(EntityMaid maid, BlockPos targetPos, float speed) {
maid.getBrain().setMemory(InitEntities.TARGET_POS.get(), new BlockPosTracker(targetPos));
BehaviorUtils.setWalkAndLookTargetMemories(maid, targetPos, speed, 0);
}
public static CurrentWork getCurrent(EntityMaid maid) {
return maid.getBrain().getMemory(MemoryModuleRegistry.CURRENT_WORK.get()).orElse(CurrentWork.IDLE);
}
public static void setCurrent(EntityMaid maid, CurrentWork currentWork) {
maid.getBrain().setMemory(MemoryModuleRegistry.CURRENT_WORK.get(), currentWork);
}
public static void setCommonBlockCache(EntityMaid maid, BlockPos pos) {
maid.getBrain().setMemory(MemoryModuleRegistry.COMMON_BLOCK_CACHE.get(), pos);
}
public static BlockPos getCommonBlockCache(EntityMaid maid) {
return maid.getBrain().getMemory(MemoryModuleRegistry.COMMON_BLOCK_CACHE.get()).orElse(null);
}
public static void setAllowHandleVehicle(EntityMaid maid, MaidVehicleControlType allow) {
maid.getBrain().setMemory(MemoryModuleRegistry.IS_ALLOW_HANDLE_VEHICLE.get(), allow);
}
public static MaidVehicleControlType getAllowHandleVehicle(EntityMaid maid) {
return maid.getBrain().getMemory(MemoryModuleRegistry.IS_ALLOW_HANDLE_VEHICLE.get()).orElse(MaidVehicleControlType.NONE);
}
public static void clearCommonBlockCache(EntityMaid maid) {
maid.getBrain().eraseMemory(MemoryModuleRegistry.COMMON_BLOCK_CACHE.get());
}
public static void setLocateItem(EntityMaid maid, ItemStack item) {
maid.getBrain().setMemory(MemoryModuleRegistry.LOCATE_ITEM.get(), item);
}
public static ItemStack getLocateItem(EntityMaid maid) {
return maid.getBrain().getMemory(MemoryModuleRegistry.LOCATE_ITEM.get()).orElse(ItemStack.EMPTY);
}
}

View File

@@ -2,6 +2,8 @@ package studio.fantasyit.maid_useful_task.util;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.shapes.CollisionContext;
public class PosUtils {
public static boolean isFourSideAir(BlockGetter level, BlockPos pos) {
@@ -11,4 +13,17 @@ public class PosUtils {
level.getBlockState(pos.east()).isAir() &&
level.getBlockState(pos.west()).isAir();
}
static protected boolean isEmptyBlockPos(Level level, BlockPos pos) {
return level.getBlockState(pos).isAir() || level.getBlockState(pos).getCollisionShape(
level,
pos,
CollisionContext.empty()
).isEmpty();
}
static public boolean isSafePos(Level level, BlockPos pos) {
return isEmptyBlockPos(level, pos)
&& isEmptyBlockPos(level, pos.above())
&& !isEmptyBlockPos(level, pos.below());
}
}

View File

@@ -0,0 +1,26 @@
package studio.fantasyit.maid_useful_task.util;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Unique;
import java.util.function.Supplier;
public class RotUtil {
public static float getXRot(Vec3 from, Vec3 to) {
double d0 = to.x() - from.x();
double d1 = to.y() - from.y();
double d2 = to.z() - from.z();
double d3 = Math.sqrt(d0 * d0 + d2 * d2);
return Mth.wrapDegrees((float) (-(Mth.atan2(d1, d3) * (double) (180F / (float) Math.PI))));
}
public static float getYRot(Vec3 from, Vec3 to) {
double d0 = to.x() - from.x();
double d1 = to.y() - from.y();
double d2 = to.z() - from.z();
double d3 = Math.sqrt(d0 * d0 + d2 * d2);
return Mth.wrapDegrees((float) (-(Mth.atan2(d0, d2) * (double) (180F / (float) Math.PI))));
}
}

View File

@@ -0,0 +1,9 @@
package studio.fantasyit.maid_useful_task.util;
import net.minecraft.network.chat.Component;
public class TranslateUtil {
public static Component getBooleanTranslate(boolean b) {
return (b ? Component.translatable("gui.maid_useful_task.yes") : Component.translatable("gui.maid_useful_task.no"));
}
}

View File

@@ -3,9 +3,13 @@ package studio.fantasyit.maid_useful_task.util;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.mojang.authlib.GameProfile;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.ListTag;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.tags.TagKey;
import net.minecraft.world.Container;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.Entity;
@@ -13,6 +17,9 @@ import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.entity.RelativeMovement;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.player.StackedContents;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level;
@@ -20,6 +27,9 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import net.minecraftforge.items.wrapper.PlayerInvWrapper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
@@ -27,8 +37,28 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
public class WrappedMaidFakePlayer extends FakePlayer {
public static class WrappedMaidInventory extends Inventory {
private final EntityMaid maid;
public WrappedMaidInventory(EntityMaid p_35983_, WrappedMaidFakePlayer fakePlayer) {
super(fakePlayer);
this.maid = p_35983_;
}
@Override
public @NotNull ItemStack getSelected() {
return maid.getMainHandItem();
}
@Override
public float getDestroySpeed(BlockState p_36021_) {
return maid.getMainHandItem().getDestroySpeed(p_36021_);
}
}
private static ConcurrentHashMap<UUID, WrappedMaidFakePlayer> cache = new ConcurrentHashMap<>();
private final EntityMaid maid;
@@ -50,6 +80,7 @@ public class WrappedMaidFakePlayer extends FakePlayer {
private WrappedMaidFakePlayer(EntityMaid maid) {
super((ServerLevel) maid.level(), new GameProfile(UUID.randomUUID(), maid.getName().getString()));
this.maid = maid;
this.inventory = new WrappedMaidInventory(maid, this);
}
@Override
@@ -179,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;

View File

@@ -0,0 +1,26 @@
package studio.fantasyit.maid_useful_task.vehicle;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import org.jetbrains.annotations.Nullable;
abstract public class AbstractMaidControllableVehicle {
abstract public boolean isMaidOnThisVehicle(EntityMaid maid);
abstract public void maidStopControlVehicle(EntityMaid maid);
abstract public void maidControlVehicle(EntityMaid maid, MaidVehicleControlType type, BlockPos target);
public void syncVehicleParameter(EntityMaid maid, CompoundTag tag){
if(maid.getVehicle() instanceof IVirtualControl vehicle){
vehicle.maid_useful_tasks$setControlParam(tag);
}
}
public @Nullable CompoundTag getSyncVehicleParameter(EntityMaid maid) {
if (maid.getVehicle() instanceof IVirtualControl vehicle) {
return vehicle.maid_useful_tasks$getControlParam();
}
return null;
}
}

View File

@@ -0,0 +1,13 @@
package studio.fantasyit.maid_useful_task.vehicle;
import net.minecraft.nbt.CompoundTag;
public interface IVirtualControl {
void maid_useful_tasks$setControlParam(float xRot, float yRot, float speed, MaidVehicleControlType type);
void maid_useful_tasks$stopControl();
CompoundTag maid_useful_tasks$getControlParam();
void maid_useful_tasks$setControlParam(CompoundTag target);
}

View File

@@ -0,0 +1,7 @@
package studio.fantasyit.maid_useful_task.vehicle;
public enum MaidVehicleControlType {
NONE,
ROT_ONLY,
FULL
}

View File

@@ -0,0 +1,47 @@
package studio.fantasyit.maid_useful_task.vehicle;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.nbt.CompoundTag;
import net.minecraftforge.network.PacketDistributor;
import studio.fantasyit.maid_useful_task.network.MaidSyncVehiclePacket;
import studio.fantasyit.maid_useful_task.network.Network;
import studio.fantasyit.maid_useful_task.vehicle.broom.VehicleBroom;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
public class MaidVehicleManager {
public static List<AbstractMaidControllableVehicle> controllableVehicles = new ArrayList<>();
public static void register() {
controllableVehicles.add(new VehicleBroom());
}
public static void addControllableVehicle(AbstractMaidControllableVehicle vehicle) {
controllableVehicles.add(vehicle);
}
public static Optional<AbstractMaidControllableVehicle> getControllableVehicle(EntityMaid maid) {
for (AbstractMaidControllableVehicle vehicle : controllableVehicles) {
if (vehicle.isMaidOnThisVehicle(maid)) return Optional.of(vehicle);
}
return Optional.empty();
}
public static void syncVehicleParameter(EntityMaid maid) {
getControllableVehicle(maid).ifPresent(vehicle -> {
CompoundTag syncVehicleParameter = vehicle.getSyncVehicleParameter(maid);
if (syncVehicleParameter != null) {
Network.INSTANCE.send(
PacketDistributor.TRACKING_ENTITY_AND_SELF.with(() -> maid),
new MaidSyncVehiclePacket(maid.getId(), syncVehicleParameter)
);
}
});
}
public static void stopControlling(EntityMaid maid) {
MaidVehicleManager.getControllableVehicle(maid).ifPresent(vehicle -> vehicle.maidStopControlVehicle(maid));
}
}

View File

@@ -0,0 +1,52 @@
package studio.fantasyit.maid_useful_task.vehicle.broom;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.nbt.CompoundTag;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class BroomControlParamStore {
public record BroomControlParam(float xRot, float yRot, float vertical, float forward,
MaidVehicleControlType type) {
public static BroomControlParam fromNbt(CompoundTag tag) {
return new BroomControlParam(
tag.getFloat("xRot"),
tag.getFloat("yRot"),
tag.getFloat("vertical"),
tag.getFloat("forward"),
MaidVehicleControlType.valueOf(tag.getString("type"))
);
}
public CompoundTag toNbt() {
CompoundTag tag = new CompoundTag();
tag.putFloat("xRot", xRot);
tag.putFloat("yRot", yRot);
tag.putFloat("vertical", vertical);
tag.putFloat("forward", forward);
tag.putString("type", type.name());
return tag;
}
}
private static final BroomControlParam NONE = new BroomControlParam(0, 0, 0, 0, MaidVehicleControlType.NONE);
private static final Map<UUID, BroomControlParam> store = new HashMap<>();
public static void setControlParam(EntityMaid maid, BroomControlParam param) {
store.put(maid.getUUID(), param);
}
public static BroomControlParam getControlParam(EntityMaid maid) {
if (!store.containsKey(maid.getUUID()))
return NONE;
return store.get(maid.getUUID());
}
public static void removeControlParam(EntityMaid maid) {
store.remove(maid.getUUID());
}
}

View File

@@ -0,0 +1,70 @@
package studio.fantasyit.maid_useful_task.vehicle.broom;
import com.github.tartaricacid.touhoulittlemaid.api.entity.IBroomControl;
import com.github.tartaricacid.touhoulittlemaid.entity.item.EntityBroom;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.phys.Vec3;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
public class BroomController implements IBroomControl {
private final EntityBroom broom;
public BroomController(EntityBroom broom) {
this.broom = broom;
}
@Override
public int getPriority() {
return 10;
}
@Override
public boolean inControl(Player player, EntityMaid entityMaid) {
return BroomControlParamStore.getControlParam(entityMaid).type() != MaidVehicleControlType.NONE;
}
@Override
public void travel(Player player, EntityMaid entityMaid) {
BroomControlParamStore.BroomControlParam param = BroomControlParamStore.getControlParam(entityMaid);
float forward = 0;
float strafe = 0;
float vertical = param.vertical();
if (param.type() == MaidVehicleControlType.FULL) {
forward = param.forward() / 15.0f;
} else {
boolean keyForward = player.zza > 0;
boolean keyBack = player.zza < 0;
boolean keyLeft = player.xxa > 0;
boolean keyRight = player.xxa < 0;
if (keyForward || keyBack || keyLeft || keyRight) {
strafe = keyLeft ? 0.2f : (keyRight ? -0.2f : 0);
forward = keyForward ? 0.375f : (keyBack ? -0.2f : 0);
} else {
vertical = 0;
}
}
//来自PlayerBroomControl
double playerSpeed = player.getAttributeValue(Attributes.MOVEMENT_SPEED);
double speed = Math.max(playerSpeed - 0.1, 0) * 2.5 + 0.1;
Vec3 targetMotion = new Vec3(strafe, vertical, forward).scale(speed * 20);
targetMotion = targetMotion.yRot((float) (-broom.getYRot() * Math.PI / 180.0));
// 插值到目标速度,而不是直接累加
Vec3 currentMotion = broom.getDeltaMovement();
Vec3 newMotion = currentMotion.lerp(targetMotion, 0.25f);
broom.setDeltaMovement(newMotion);
}
@Override
public void tickRot(Player player, EntityMaid entityMaid) {
BroomControlParamStore.BroomControlParam param = BroomControlParamStore.getControlParam(entityMaid);
broom.yRotO = broom.yBodyRot = broom.yHeadRot = broom.getYRot();
broom.setRot(param.yRot(), param.xRot());
}
}

View File

@@ -0,0 +1,79 @@
package studio.fantasyit.maid_useful_task.vehicle.broom;
import com.github.tartaricacid.touhoulittlemaid.entity.item.EntityBroom;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import org.jetbrains.annotations.Nullable;
import studio.fantasyit.maid_useful_task.util.RotUtil;
import studio.fantasyit.maid_useful_task.vehicle.AbstractMaidControllableVehicle;
import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
public class VehicleBroom extends AbstractMaidControllableVehicle {
@Override
public boolean isMaidOnThisVehicle(EntityMaid maid) {
return maid.getVehicle() instanceof EntityBroom;
}
@Override
public void maidControlVehicle(EntityMaid maid, MaidVehicleControlType type, BlockPos target) {
if (maid.level().isClientSide) return;
if (maid.getVehicle() instanceof EntityBroom vehicle) {
if (type == MaidVehicleControlType.NONE) {
BroomControlParamStore.removeControlParam(maid);
return;
}
double xzDistance = maid.distanceToSqr(target.getX(), maid.getY(), target.getZ());
double finalXRot = vehicle.getXRot();
double finalYRot = vehicle.getYRot();
double finalVertical = 0;
double finalForward;
if (vehicle.isInWater()) {
finalXRot = 0;
finalVertical = 0.1;
} else if (xzDistance < Math.pow(maid.getY() - maid.level().getSeaLevel(), 2)) {
finalXRot = 0;
if (maid.getY() - maid.level().getSeaLevel() < 50 || vehicle.onGround()) {
finalXRot = 5;
finalVertical = -0.2;
} else {
finalXRot = 50;
finalVertical = -0.35;
}
} else if (maid.getY() < 100) {
finalXRot = -50;
finalVertical = 0.2;
} else if (maid.getY() > 160) {
finalXRot = 0;
finalVertical = -0.1;
} else {
finalXRot = 0;
finalVertical = 0.05;
}
finalYRot = RotUtil.getYRot(maid.position(), target.getCenter());
finalForward = type == MaidVehicleControlType.FULL ? 3.0 : 0;
if (xzDistance < 5 * 5)
finalForward = 0;
BroomControlParamStore.setControlParam(maid, new BroomControlParamStore.BroomControlParam((float) finalXRot, (float) finalYRot, (float) finalVertical, (float) finalForward, type));
}
}
@Override
public void maidStopControlVehicle(EntityMaid maid) {
BroomControlParamStore.removeControlParam(maid);
}
@Override
public void syncVehicleParameter(EntityMaid maid, CompoundTag tag) {
BroomControlParamStore.BroomControlParam broomControlParam = BroomControlParamStore.BroomControlParam.fromNbt(tag);
BroomControlParamStore.setControlParam(maid, broomControlParam);
}
@Override
public @Nullable CompoundTag getSyncVehicleParameter(EntityMaid maid) {
return BroomControlParamStore.getControlParam(maid).toNbt();
}
}

View File

@@ -1 +1,3 @@
public net.minecraft.world.level.BlockGetter m_151361_(Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Ljava/lang/Object;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object;
public net.minecraft.world.level.BlockGetter m_151361_(Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Ljava/lang/Object;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object;
public-f net.minecraft.world.entity.player.Player f_36093_
public net.minecraft.world.entity.Entity m_19915_(FF)V

View File

@@ -64,3 +64,17 @@ description='''${mod_description}'''
versionRange="${minecraft_version_range}"
ordering="NONE"
side="BOTH"
[[dependencies."${mod_id}"]]
modId="touhou_little_maid"
mandatory=true
versionRange="[1.3.7,)"
ordering="AFTER"
side="BOTH"
[[dependencies."${mod_id}"]]
modId="playerrevive"
mandatory=false
versionRange="[2.0.16,)"
ordering="AFTER"
side="BOTH"

View File

@@ -1,3 +1,19 @@
{
"task.maid_useful_task.maid_tree": "Logging"
"task.maid_useful_task.maid_tree": "Logging",
"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.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",
"maid_useful_task.allow_handle_vehicle.full": "Allow maid control vehicle",
"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.revive.ownerOnly": "Only revive owner",
"gui.maid_useful_task.logging.block_up": "Block Up",
"gui.maid_useful_task.logging.skip_non_nature": "Skip Non-nature Logs"
}

View File

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

View File

@@ -5,6 +5,7 @@
"compatibilityLevel": "JAVA_8",
"refmap": "maid_useful_task.refmap.json",
"mixins": [
"FollowMaidMixin",
"MaidCheckPickupItem",
"MaidMoveControlMixin",
"MaidRunOneMixin"