Merge pull request #651

sync 1.19.2
TartaricAcid · Jan 22, 2025 · 0ae7205 · 0ae7205
2 parents 533a0e6 + 45bce33
commit 0ae7205
Show file tree

Hide file tree

Showing 129 changed files with 6,465 additions and 758 deletions.
diff --git a/build.gradle b/build.gradle
@@ -124,6 +124,19 @@ repositories {
     maven {
         url = "https://api.modrinth.com/maven"
     }
+    maven {
+        url = "https://maven.conczin.net/Artifacts"
+    }
+    maven {
+        // location of the maven that hosts JEI files since January 2023
+        name = "Jared's maven"
+        url = "https://maven.blamejared.com/"
+    }
+    maven {
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.dev"
+    }
 }
 
 dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
-mod_version=1.1.13
+mod_version=1.1.14
 forge_version=1.19.2-43.2.0
 mc_version=1.19.2
 jei_version=11.4.0.286

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/generated/resources/data/touhou_little_maid/tags/items/maid_tamed_item.json b/src/generated/resources/data/touhou_little_maid/tags/items/maid_tamed_item.json
@@ -0,0 +1,45 @@
+{
+  "values": [
+    "minecraft:cake",
+    {
+      "id": "#forge:cakes",
+      "required": false
+    },
+    {
+      "id": "#c:cakes",
+      "required": false
+    },
+    {
+      "id": "#jmc:cakes",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:cheese_cake",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:honey_cheese_cake",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:chocolate_cheese_cake",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:piece_of_cake",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:piece_of_cheesecake",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:piece_of_chocolate_cheesecake",
+      "required": false
+    },
+    {
+      "id": "kawaiidishes:piece_of_honey_cheesecake",
+      "required": false
+    }
+  ]
+}
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/ILittleMaid.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/ILittleMaid.java
@@ -1,6 +1,7 @@
 package com.github.tartaricacid.touhoulittlemaid.api;
 
 import com.github.tartaricacid.touhoulittlemaid.block.multiblock.MultiBlockManager;
+import com.github.tartaricacid.touhoulittlemaid.client.animation.HardcodedAnimationManger;
 import com.github.tartaricacid.touhoulittlemaid.client.overlay.MaidTipsOverlay;
 import com.github.tartaricacid.touhoulittlemaid.client.renderer.entity.EntityMaidRenderer;
 import com.github.tartaricacid.touhoulittlemaid.client.renderer.entity.GeckoEntityMaidRenderer;
@@ -103,4 +104,11 @@ default void addAdditionMaidLayer(EntityMaidRenderer renderer, EntityRendererPro
     @OnlyIn(Dist.CLIENT)
     default void addAdditionGeckoMaidLayer(GeckoEntityMaidRenderer<? extends Mob> renderer, EntityRendererProvider.Context context) {
     }
+
+    /**
+     * 添加硬编码的动画
+     */
+    @OnlyIn(Dist.CLIENT)
+    default void addHardcodeAnimation(HardcodedAnimationManger manger) {
+    }
 }
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/animation/ICustomAnimation.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/animation/ICustomAnimation.java
@@ -0,0 +1,85 @@
+package com.github.tartaricacid.touhoulittlemaid.api.animation;
+
+import com.github.tartaricacid.touhoulittlemaid.client.model.bedrock.BedrockPart;
+import com.github.tartaricacid.touhoulittlemaid.geckolib3.geo.animated.AnimatedGeoModel;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.world.entity.LivingEntity;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+
+public interface ICustomAnimation<T extends LivingEntity> {
+    /**
+     * 一个工具类，用来获取指定名称的 BedrockPart
+     *
+     * @param models   所有的骨骼
+     * @param partName 指定名称的骨骼
+     * @return 如果找不到，那么返回 null
+     */
+    @Nullable
+    static BedrockPart getPartOrNull(HashMap<String, ? extends IModelRenderer> models, String partName) {
+        IModelRenderer renderer = models.get(partName);
+        if (renderer == null) {
+            return null;
+        }
+        return renderer.getModelRenderer();
+    }
+
+    /**
+     * 旧版模型
+     * 原版里，全局的旋转是单独独立出来一个方法，比后面的动画部分要早执行
+     *
+     * @param entity       实体
+     * @param poseStack    矩阵，就是改变它来控制全局旋转
+     * @param ageInTicks   实体的 tick 时间，从 0 开始一直增大
+     * @param rotationYaw  实体的整体的 Y Rot，单位为角度
+     * @param partialTicks 插值
+     */
+    default void setupRotations(T entity, PoseStack poseStack, float ageInTicks, float rotationYaw, float partialTicks) {
+    }
+
+    /**
+     * GeckoLib 版模型
+     * 原版里，全局的旋转是单独独立出来一个方法，比后面的动画部分要早执行
+     *
+     * @param entity       实体
+     * @param poseStack    矩阵，就是改变它来控制全局旋转
+     * @param ageInTicks   实体的 tick 时间，从 0 开始一直增大
+     * @param rotationYaw  实体的整体的 Y Rot，单位为角度
+     * @param partialTicks 插值
+     */
+    default void setupGeckoRotations(T entity, PoseStack poseStack, float ageInTicks, float rotationYaw, float partialTicks) {
+    }
+
+    /**
+     * 需要添加的动画（旧版模型）
+     *
+     * @param entity          实体
+     * @param models          所有的骨骼
+     * @param limbSwing       实体行走的里程，可以理解为汽车的里程表
+     * @param limbSwingAmount 实体行走的速度，可以理解为汽车的速度表
+     * @param ageInTicks      实体的 tick 时间，从 0 开始一直增大
+     * @param netHeadYaw      实体的头部 Y Rot，单位为角度
+     * @param headPitch       实体的头部 X Rot，单位为角度
+     */
+    default void setRotationAngles(T entity, HashMap<String, ? extends IModelRenderer> models,
+                                   float limbSwing, float limbSwingAmount, float ageInTicks,
+                                   float netHeadYaw, float headPitch) {
+    }
+
+    /**
+     * 需要添加的动画（GeckoLib 版模型）
+     *
+     * @param entity          实体
+     * @param model           所有的骨骼
+     * @param limbSwing       实体行走的里程，可以理解为汽车的里程表
+     * @param limbSwingAmount 实体行走的速度，可以理解为汽车的速度表
+     * @param ageInTicks      实体的 tick 时间，从 0 开始一直增大
+     * @param netHeadYaw      实体的头部 Y Rot，单位为角度
+     * @param headPitch       实体的头部 X Rot，单位为角度
+     */
+    default void setGeckoRotationAngles(T entity, AnimatedGeoModel model,
+                                        float limbSwing, float limbSwingAmount, float ageInTicks,
+                                        float netHeadYaw, float headPitch) {
+    }
+}
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/animation/IModelRenderer.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/animation/IModelRenderer.java
@@ -1,6 +1,15 @@
 package com.github.tartaricacid.touhoulittlemaid.api.animation;
 
+import com.github.tartaricacid.touhoulittlemaid.client.model.bedrock.BedrockPart;
+
 public interface IModelRenderer {
+    /**
+     * Get ModelRenderer's BedrockPart
+     *
+     * @return BedrockPart
+     */
+    BedrockPart getModelRenderer();
+
     /**
      * Get ModelRenderer's x rotate angle
      *

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/entity/IMaid.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/entity/IMaid.java
@@ -160,6 +160,10 @@ default boolean hasFishingHook() {
         return false;
     }
 
+    default boolean onClimbable() {
+        return false;
+    }
+
     // 下方为 Deprecated 方法，仅用于适配旧版本模型，无需 Override
 
     @Deprecated

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/mixin/IPlayerMixin.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/mixin/IPlayerMixin.java
@@ -0,0 +1,5 @@
+package com.github.tartaricacid.touhoulittlemaid.api.mixin;
+
+public interface IPlayerMixin {
+    boolean tlmInRemoveVehicleCooldown();
+}
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/task/IAttackTask.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/task/IAttackTask.java
@@ -76,6 +76,29 @@ default boolean canAttack(EntityMaid maid, LivingEntity target) {
         return DefaultMonsterType.canAttack(maid, target, monsterType);
     }
 
+    /**
+     * 是否拥有额外攻击方式，用于一些额外增伤的设计
+     * 比如女仆副手持有灭火器，会额外对下界生物造成二次伤害
+     *
+     * @param maid   女仆
+     * @param target 攻击目标
+     * @return 是否有额外攻击方式
+     */
+    default boolean hasExtraAttack(EntityMaid maid, Entity target) {
+        return false;
+    }
+
+    /**
+     * 执行额外伤害
+     *
+     * @param maid   女仆
+     * @param target 攻击目标
+     * @return 是否成功造成伤害
+     */
+    default boolean doExtraAttack(EntityMaid maid, Entity target) {
+        return false;
+    }
+
     @Override
     default MenuProvider getTaskConfigGuiProvider(EntityMaid maid) {
         final int entityId = maid.getId();
@@ -92,14 +115,6 @@ public AbstractMaidContainer createMenu(int index, Inventory playerInventory, Pl
         };
     }
 
-    default boolean hasExtraAttack(EntityMaid maid, Entity target) {
-        return false;
-    }
-
-    default boolean doExtraAttack(EntityMaid maid, Entity target) {
-        return false;
-    }
-
     @Override
     default boolean enablePanic(EntityMaid maid) {
         return false;

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/task/IMaidTask.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/task/IMaidTask.java
@@ -14,13 +14,19 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.ai.behavior.Behavior;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.phys.AABB;
 
 import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
 
 public interface IMaidTask {
+    /**
+     * 垂直搜索范围
+     */
+    int VERTICAL_SEARCH_RANGE = 4;
+
     /**
      * 模式 ID，用于后续模式的判断，也用于本地化的 key
      *
@@ -166,4 +172,33 @@ public AbstractMaidContainer createMenu(int index, Inventory playerInventory, Pl
     default MenuProvider getTaskInfoGuiProvider(EntityMaid maid) {
         return maid.getMaidBackpackType().getGuiProvider(maid.getId());
     }
+
+    /**
+     * 实体搜索范围
+     * <p>
+     * 给一些远程攻击的武器提供另一些搜索范围，实现超远视距打击
+     *
+     * @param maid 女仆
+     * @return 实体搜索范围
+     */
+    default AABB searchDimension(EntityMaid maid) {
+        float radius = this.searchRadius(maid);
+        if (maid.hasRestriction()) {
+            return new AABB(maid.getRestrictCenter()).inflate(radius, VERTICAL_SEARCH_RANGE, radius);
+        } else {
+            return maid.getBoundingBox().inflate(radius, VERTICAL_SEARCH_RANGE, radius);
+        }
+    }
+
+    /**
+     * 实体搜索范围的水平范围值
+     *
+     * @param maid 女仆
+     * @return 实体搜索范围水平范围值
+     *
+     */
+    default float searchRadius(EntityMaid maid) {
+        // 默认依据女仆的工作范围划定搜索范围
+        return maid.getRestrictRadius();
+    }
 }
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/task/IRangedAttackTask.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/task/IRangedAttackTask.java
@@ -2,8 +2,47 @@
 
 import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.targeting.TargetingConditions;
+import net.minecraftforge.common.ForgeConfigSpec;
+
+import java.util.List;
+import java.util.Optional;
 
 public interface IRangedAttackTask extends IAttackTask {
+    /**
+     * 可见性校验工具，来自于 Sensor
+     */
+    TargetingConditions TARGET_CONDITIONS = TargetingConditions.forCombat();
+
+    /**
+     * 寻找第一个可见目标，使用独立的方法，区别于 IAttackTask
+     *
+     * @param maid 女仆
+     * @return 第一个可视对象
+     */
+    static Optional<? extends LivingEntity> findFirstValidAttackTarget(EntityMaid maid) {
+        if (maid.getBrain().getMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES).isPresent()) {
+            List<LivingEntity> list = maid.getBrain().getMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES).get();
+            return list.stream().filter(e -> maid.canAttack(e) && maid.canSee(e)).findAny();
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * 依据配置文件和 TargetingConditions 来检验攻击目标是否符合条件
+     *
+     * @param maid        女仆
+     * @param target      女仆将要攻击的对象
+     * @param configRange 相关距离的配置文件
+     * @return 能够攻击
+     */
+    static boolean targetConditionsTest(EntityMaid maid, LivingEntity target, ForgeConfigSpec.IntValue configRange) {
+        TARGET_CONDITIONS.range(configRange.get());
+        return TARGET_CONDITIONS.test(maid, target);
+    }
+
     /**
      * 执行射击动作
      *
@@ -12,4 +51,18 @@ public interface IRangedAttackTask extends IAttackTask {
      * @param distanceFactor 距离因素，即弓箭的蓄力值
      */
     void performRangedAttack(EntityMaid shooter, LivingEntity target, float distanceFactor);
+
+    /**
+     * 女仆是否能看到敌人
+     * <p>
+     * 因为原版默认的攻击识别范围是固定死的 16 格，但是一些远程武器我们希望获得超视距打击
+     * 通过修改此处来获得更远的攻击距离
+     *
+     * @param maid   女仆
+     * @param target 攻击目标
+     * @return 是否在可视范围内
+     */
+    default boolean canSee(EntityMaid maid, LivingEntity target) {
+        return BehaviorUtils.canSee(maid, target);
+    }
 }