From ab5eb31a284bb15cf349682fb10a8694a5aa7c6c Mon Sep 17 00:00:00 2001 From: Ap_Tx <3045929398@qq.com> Date: Sat, 3 Oct 2026 08:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E9=BE=9F=E5=B0=B1=E5=9C=B0=E4=B8=8B?= =?UTF-8?q?=E8=9B=8Bmod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 9 + .github/workflows/build.yml | 40 +++ .gitignore | 40 +++ LICENSE | 121 ++++++++ OPTIMIZATION.diff | 272 ++++++++++++++++++ README.md | 93 ++++++ build.gradle.kts | 104 +++++++ gradle.properties | 18 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 47505 bytes gradle/wrapper/gradle-wrapper.properties | 9 + gradlew | 248 ++++++++++++++++ gradlew.bat | 82 ++++++ settings.gradle.kts | 17 ++ .../com/mr/client/TurtleReproduceClient.kt | 9 + .../mr/client/TurtleReproduceDataGenerator.kt | 9 + .../mr/gametest/TurtleNestingGameTests.java | 202 +++++++++++++ .../com/mr/gametest/WetNestingGameTests.java | 113 ++++++++ .../gametest/structure/shore.snbt | 7 + src/gametest/resources/fabric.mod.json | 17 ++ .../java/com/mr/ai/NestingSiteFinder.java | 254 ++++++++++++++++ .../com/mr/mixin/PathNavigationAccessor.java | 11 + .../java/com/mr/mixin/TurtleAccessor.java | 22 ++ .../com/mr/mixin/TurtleGoHomeGoalMixin.java | 32 +++ .../com/mr/mixin/TurtleLayEggGoalMixin.java | 129 +++++++++ src/main/kotlin/com/mr/TurtleReproduce.kt | 18 ++ .../assets/turtle-reproduce/icon.png | Bin 0 -> 2647 bytes src/main/resources/fabric.mod.json | 43 +++ .../resources/turtle-reproduce.mixins.json | 17 ++ 28 files changed, 1936 insertions(+) create mode 100644 .gitattributes create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 OPTIMIZATION.diff create mode 100644 README.md create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/client/kotlin/com/mr/client/TurtleReproduceClient.kt create mode 100644 src/client/kotlin/com/mr/client/TurtleReproduceDataGenerator.kt create mode 100644 src/gametest/java/com/mr/gametest/TurtleNestingGameTests.java create mode 100644 src/gametest/java/com/mr/gametest/WetNestingGameTests.java create mode 100644 src/gametest/resources/data/turtle-reproduce-gametest/gametest/structure/shore.snbt create mode 100644 src/gametest/resources/fabric.mod.json create mode 100644 src/main/java/com/mr/ai/NestingSiteFinder.java create mode 100644 src/main/java/com/mr/mixin/PathNavigationAccessor.java create mode 100644 src/main/java/com/mr/mixin/TurtleAccessor.java create mode 100644 src/main/java/com/mr/mixin/TurtleGoHomeGoalMixin.java create mode 100644 src/main/java/com/mr/mixin/TurtleLayEggGoalMixin.java create mode 100644 src/main/kotlin/com/mr/TurtleReproduce.kt create mode 100644 src/main/resources/assets/turtle-reproduce/icon.png create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/turtle-reproduce.mixins.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e9a0cdf --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + runs-on: ubuntu-24.04 + steps: + - name: checkout repository + uses: actions/checkout@v6 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v6 + - name: setup jdk + uses: actions/setup-java@v5 + with: + java-version: '25' + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build and run server game tests + run: ./gradlew build + - name: capture game test diagnostics + if: failure() + uses: actions/upload-artifact@v7 + with: + name: Game-test-diagnostics + path: | + build/reports/ + build/test-results/ + build/run/gameTest/logs/ + build/run/gameTest/crash-reports/ + - name: capture build artifacts + uses: actions/upload-artifact@v7 + with: + name: Artifacts + path: build/libs/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/OPTIMIZATION.diff b/OPTIMIZATION.diff new file mode 100644 index 0000000..b50928c --- /dev/null +++ b/OPTIMIZATION.diff @@ -0,0 +1,272 @@ +--- a/src/main/java/com/mr/ai/NestingSiteFinder.java ++++ b/src/main/java/com/mr/ai/NestingSiteFinder.java +@@ -1,21 +1,64 @@ + package com.mr.ai; + + import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap; ++import it.unimi.dsi.fastutil.longs.LongArrayList; + import net.minecraft.core.BlockPos; ++import net.minecraft.core.SectionPos; + import net.minecraft.tags.BlockTags; + import net.minecraft.tags.FluidTags; + import net.minecraft.world.entity.animal.turtle.Turtle; ++import net.minecraft.world.level.Level; + import net.minecraft.world.level.LevelReader; + import net.minecraft.world.level.block.TurtleEggBlock; + import net.minecraft.world.level.block.state.BlockState; ++import net.minecraft.world.level.chunk.ChunkAccess; ++import net.minecraft.world.level.chunk.LevelChunkSection; ++import net.minecraft.world.level.chunk.status.ChunkStatus; + import net.minecraft.world.level.material.FluidState; ++import net.minecraft.world.phys.Vec3; + + import java.util.ArrayList; + import java.util.Comparator; + import java.util.List; + +-/** Finds dry nesting blocks beside nearby, exposed source water. */ ++/** ++ * Finds dry nesting blocks beside nearby, exposed source water. ++ * ++ *

This class was rewritten for throughput. The scan is the hot path: one call ++ * covers 73 x 73 columns x 19 vertical steps, and a pregnant turtle re-runs it ++ * whenever it drifts more than four blocks from the previous search origin or ++ * exhausts its cached candidate list. ++ * ++ *

Every result-affecting rule is unchanged: ++ *

++ * ++ *

What changed, and why it is equivalent: ++ *

++ */ + public final class NestingSiteFinder { + public static final int SEARCH_RADIUS = 32; + public static final int VERTICAL_SEARCH_RADIUS = 8; + public static final int WATER_RADIUS = 4; +@@ -36,38 +79,82 @@ + * turtle. A four-block halo includes water beside nests at the boundary. + * The caller must check the turtle's collision box and navigation path. + */ + public static List findCandidates(Turtle turtle) { +- LevelReader level = turtle.level(); ++ Level level = turtle.level(); + BlockPos origin = turtle.blockPosition(); ++ int originX = origin.getX(); ++ int originY = origin.getY(); ++ int originZ = origin.getZ(); + int scanRadius = SEARCH_RADIUS + WATER_RADIUS; +- int minY = Math.max(level.getMinY(), origin.getY() - VERTICAL_SEARCH_RADIUS - WATER_VERTICAL_RADIUS); +- int maxY = Math.min(level.getMaxY() - 1, origin.getY() + VERTICAL_SEARCH_RADIUS + WATER_VERTICAL_RADIUS); ++ int minY = Math.max(level.getMinY(), originY - VERTICAL_SEARCH_RADIUS - WATER_VERTICAL_RADIUS); ++ int maxY = Math.min(level.getMaxY() - 1, originY + VERTICAL_SEARCH_RADIUS + WATER_VERTICAL_RADIUS); ++ int nestMinX = originX - SEARCH_RADIUS; ++ int nestMaxX = originX + SEARCH_RADIUS; ++ int nestMinZ = originZ - SEARCH_RADIUS; ++ int nestMaxZ = originZ + SEARCH_RADIUS; ++ int nestMinY = originY - VERTICAL_SEARCH_RADIUS; ++ int nestMaxY = originY + VERTICAL_SEARCH_RADIUS; ++ + BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); +- List sandBlocks = new ArrayList<>(); ++ LongArrayList sandBlocks = new LongArrayList(); + Long2DoubleOpenHashMap waterDistances = new Long2DoubleOpenHashMap(); + waterDistances.defaultReturnValue(Double.POSITIVE_INFINITY); + + // Read each block once, instead of repeatedly querying the world around + // every sand block. Unloaded chunks are never requested or generated. +- for (int dx = -scanRadius; dx <= scanRadius; dx++) { +- int x = origin.getX() + dx; +- for (int dz = -scanRadius; dz <= scanRadius; dz++) { +- int z = origin.getZ() + dz; +- if (!level.hasChunk(x >> 4, z >> 4)) { +- continue; +- } +- boolean inNestRange = Math.abs(dx) <= SEARCH_RADIUS && Math.abs(dz) <= SEARCH_RADIUS; +- for (int y = minY; y <= maxY; y++) { +- cursor.set(x, y, z); +- BlockState state = level.getBlockState(cursor); +- if (isExposedSourceWater(level, cursor, state)) { +- waterDistances.put(cursor.asLong(), cursor.distToCenterSqr(turtle.position())); +- } +- if (inNestRange && Math.abs(y - origin.getY()) <= VERTICAL_SEARCH_RADIUS +- && state.is(BlockTags.SAND) +- && level.isEmptyBlock(cursor.above())) { +- sandBlocks.add(cursor.immutable()); ++ if (minY <= maxY) { ++ Vec3 turtlePos = turtle.position(); ++ int minSection = level.getSectionIndex(minY); ++ int maxSection = level.getSectionIndex(maxY); ++ for (int chunkX = (originX - scanRadius) >> 4; chunkX <= (originX + scanRadius) >> 4; chunkX++) { ++ int fromX = Math.max(originX - scanRadius, chunkX << 4); ++ int toX = Math.min(originX + scanRadius, (chunkX << 4) + 15); ++ for (int chunkZ = (originZ - scanRadius) >> 4; chunkZ <= (originZ + scanRadius) >> 4; chunkZ++) { ++ // The same test Level#hasChunk performs, except the chunk is ++ // kept: loadOrGenerate = false never loads or generates. ++ ChunkAccess chunk = level.getChunk(chunkX, chunkZ, ChunkStatus.FULL, false); ++ if (chunk == null) { ++ continue; ++ } ++ int fromZ = Math.max(originZ - scanRadius, chunkZ << 4); ++ int toZ = Math.min(originZ + scanRadius, (chunkZ << 4) + 15); ++ LevelChunkSection[] sections = chunk.getSections(); ++ for (int sectionIndex = minSection; sectionIndex <= maxSection; sectionIndex++) { ++ if (sectionIndex < 0 || sectionIndex >= sections.length) { ++ continue; ++ } ++ LevelChunkSection section = sections[sectionIndex]; ++ // An all-air section holds neither water nor sand, so ++ // skipping it reads no block the loops could have used. ++ if (section == null || section.hasOnlyAir()) { ++ continue; ++ } ++ int sectionMinY = SectionPos.sectionToBlockCoord(level.getMinSectionY() + sectionIndex); ++ int fromY = Math.max(minY, sectionMinY); ++ int toY = Math.min(maxY, sectionMinY + 15); ++ boolean nestSection = fromY <= nestMaxY && toY >= nestMinY; ++ for (int x = fromX; x <= toX; x++) { ++ int localX = x & 15; ++ boolean nestX = x >= nestMinX && x <= nestMaxX; ++ for (int z = fromZ; z <= toZ; z++) { ++ boolean inNestRange = nestSection && nestX && z >= nestMinZ && z <= nestMaxZ; ++ int localZ = z & 15; ++ for (int y = fromY; y <= toY; y++) { ++ BlockState state = section.getBlockState(localX, y & 15, localZ); ++ if (isExposedSourceWater(level, cursor, x, y, z, state)) { ++ cursor.set(x, y, z); ++ waterDistances.put(BlockPos.asLong(x, y, z), ++ cursor.distToCenterSqr(turtlePos)); ++ } ++ if (inNestRange && y >= nestMinY && y <= nestMaxY ++ && state.is(BlockTags.SAND) ++ && level.isEmptyBlock(cursor.set(x, y + 1, z))) { ++ sandBlocks.add(BlockPos.asLong(x, y, z)); ++ } ++ } ++ } ++ } + } + } + } + } +@@ -75,23 +162,30 @@ + List candidates = new ArrayList<>(); + if (waterDistances.isEmpty()) { + return candidates; + } +- for (BlockPos sand : sandBlocks) { ++ Vec3 turtlePos = turtle.position(); ++ for (int index = 0; index < sandBlocks.size(); index++) { ++ long packedSand = sandBlocks.getLong(index); ++ int sandX = BlockPos.getX(packedSand); ++ int sandY = BlockPos.getY(packedSand); ++ int sandZ = BlockPos.getZ(packedSand); + double nearestWaterDistance = Double.POSITIVE_INFINITY; + for (int dx = -WATER_RADIUS; dx <= WATER_RADIUS; dx++) { + for (int dz = -WATER_RADIUS; dz <= WATER_RADIUS; dz++) { + if (dx * dx + dz * dz > WATER_RADIUS * WATER_RADIUS) { + continue; + } + for (int dy = -WATER_VERTICAL_RADIUS; dy <= WATER_VERTICAL_RADIUS; dy++) { +- long waterPosition = BlockPos.asLong(sand.getX() + dx, sand.getY() + dy, sand.getZ() + dz); ++ long waterPosition = BlockPos.asLong(sandX + dx, sandY + dy, sandZ + dz); + nearestWaterDistance = Math.min(nearestWaterDistance, waterDistances.get(waterPosition)); + } + } + } + if (Double.isFinite(nearestWaterDistance)) { +- candidates.add(new Candidate(sand, nearestWaterDistance, sand.distToCenterSqr(turtle.position()))); ++ cursor.set(sandX, sandY, sandZ); ++ candidates.add(new Candidate(new BlockPos(sandX, sandY, sandZ), nearestWaterDistance, ++ cursor.distToCenterSqr(turtlePos))); + } + } + candidates.sort(CANDIDATE_ORDER); + return candidates; +@@ -104,39 +198,56 @@ + || !TurtleEggBlock.isSand(level, sandPos) + || !level.isEmptyBlock(sandPos.above())) { + return false; + } ++ int sandX = sandPos.getX(); ++ int sandY = sandPos.getY(); ++ int sandZ = sandPos.getZ(); + BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); ++ int lastChunkX = Integer.MIN_VALUE; ++ int lastChunkZ = Integer.MIN_VALUE; ++ boolean lastChunkLoaded = false; + for (int dx = -WATER_RADIUS; dx <= WATER_RADIUS; dx++) { + for (int dz = -WATER_RADIUS; dz <= WATER_RADIUS; dz++) { + if (dx * dx + dz * dz > WATER_RADIUS * WATER_RADIUS) { + continue; + } +- int x = sandPos.getX() + dx; +- int z = sandPos.getZ() + dz; +- if (!level.hasChunk(x >> 4, z >> 4)) { ++ int x = sandX + dx; ++ int z = sandZ + dz; ++ int chunkX = x >> 4; ++ int chunkZ = z >> 4; ++ // The disk above spans at most four chunks, so this only removes ++ // repeated queries for columns that share a chunk. ++ if (chunkX != lastChunkX || chunkZ != lastChunkZ) { ++ lastChunkX = chunkX; ++ lastChunkZ = chunkZ; ++ lastChunkLoaded = level.hasChunk(chunkX, chunkZ); ++ } ++ if (!lastChunkLoaded) { + continue; + } + for (int dy = -WATER_VERTICAL_RADIUS; dy <= WATER_VERTICAL_RADIUS; dy++) { +- cursor.set(x, sandPos.getY() + dy, z); +- if (level.isInsideBuildHeight(cursor) && level.isInsideBuildHeight(cursor.above()) +- && isExposedSourceWater(level, cursor, level.getBlockState(cursor))) { ++ int y = sandY + dy; ++ cursor.set(x, y, z); ++ if (level.isInsideBuildHeight(y) && level.isInsideBuildHeight(y + 1) ++ && isExposedSourceWater(level, cursor, x, y, z, level.getBlockState(cursor))) { + return true; + } + } + } + } + return false; + } + +- private static boolean isExposedSourceWater(LevelReader level, BlockPos pos, BlockState state) { ++ private static boolean isExposedSourceWater(LevelReader level, BlockPos.MutableBlockPos cursor, ++ int x, int y, int z, BlockState state) { + // Requiring a liquid block excludes waterlogged fences, slabs and other + // solid blocks even though their fluid state may report source water. + if (!state.liquid()) { + return false; + } + FluidState fluid = state.getFluidState(); +- return fluid.is(FluidTags.WATER) && fluid.isSource() && level.isEmptyBlock(pos.above()); ++ return fluid.is(FluidTags.WATER) && fluid.isSource() && level.isEmptyBlock(cursor.set(x, y + 1, z)); + } + + public record Candidate(BlockPos sandPos, double waterDistanceSquared, double sandDistanceSquared) { + } diff --git a/README.md b/README.md new file mode 100644 index 0000000..52850e9 --- /dev/null +++ b/README.md @@ -0,0 +1,93 @@ +# Turtle Reproduce — 海龟就地产卵 + +适用于 **Minecraft Java 26.1.2 / Fabric**。海龟繁殖后会寻找当前位置附近最近水源边、能够走到的沙地,直接挖沙产卵,不再为了产卵返回出生地。 + +> 📌 **本副本基于上游源文件修改**:只对热路径做了一处**性能优化**,玩法行为不变(不做成成品 mod 分发,只提供工程源码)。 +> 改动清单见文末「本副本的改动(相对上游源文件)」,逐行 diff 见 `OPTIMIZATION.diff`。 + +## 行为规则 + +- 从海龟当前位置搜索 X/Z 各 ±32 格、Y ±8 格的已加载区域,不主动加载或生成新区块。 +- 沙地须上方为空气,且水平 4 格半径、垂直 ±1 格内有露出水面的静止水源。普通沙子和红沙均适用;流动水及含水方块不算水源。 +- 优先选择距离海龟最近的水源对应的沙地;对应同一水源时,选择距离海龟最近的可达沙地。被墙挡住、站立空间不足的位置会跳过。 +- 保留原版挖沙动画、产卵数量(1~4 枚)、繁殖冷却和孵化机制。 +- 找不到合适地点时,海龟保留腹中的蛋并稍后重试。可在附近补上水源和沙地。 +- 不改写海龟的出生地数据;没有携带蛋时的普通活动保留原版行为。 + +## 安装 + +需要 Java 25 或更高版本、Fabric Loader 0.19.5 或更高版本,以及适用于 26.1.2 的 Fabric API、Fabric Language Kotlin。 + +本包已随附编译好的成品 `build/libs/turtle-reproduce-1.0.0.jar`(由本包源码构建,20,528 字节,SHA-256 `f61e53d152dd2722a4dda31d63cd8fedd201af312d5fce03bc4a3c8c36e704b6`),可直接使用,无需自行编译。 + +将 `build/libs/turtle-reproduce-1.0.0.jar` 放入游戏实例或服务器的 `mods` 文件夹,不要安装 `-sources.jar`。 + +单人游戏安装到客户端。多人游戏安装到服务器即可,玩家客户端不需要安装本模组。 + +## 构建与测试 + +使用 JDK 25,在项目目录运行: + +```powershell +.\gradlew.bat build +``` + +Linux / macOS: + +```sh +./gradlew build +``` + +如果终端默认使用 Java 21,先将当前终端的 `JAVA_HOME` 指向 JDK 25。IntelliJ IDEA 中也应把 Gradle JVM 设置为 25。 + +服务器游戏测试: + +```powershell +.\gradlew.bat runGameTest +``` + +`build` 会自动运行服务器游戏测试,也可用上面的命令单独运行。测试在独立世界覆盖真实繁殖、异地产卵、最近水岸、16 格外水岸、绕过封闭水岸、无沙地保留蛋、无水沙地拒绝产卵以及身体触水时选择干燥位置。测试代码不打包进发布模组。 + +手动体验时,可将两只海龟带离出生海滩,在新地点修建开阔沙岸和水池,用海草喂食繁殖。怀卵海龟应在新沙岸挖沙产卵。注意让沙岸足够宽,保留海龟进出水面的通道。 + +## 本副本的改动(相对上游源文件) + +本副本以上游源文件为基础,改动**只集中在一个文件**,目的是降低服务端开销;玩法规则、判定条件、数值与数据格式**一律未变**。 + +| 项 | 内容 | +|---|---| +| 改动文件 | `src/main/java/com/mr/ai/NestingSiteFinder.java`(唯一被改动的文件) | +| 未改动 | 4 个 mixin(`TurtleLayEggGoalMixin`、`TurtleGoHomeGoalMixin`、`TurtleAccessor`、`PathNavigationAccessor`)、Kotlin 入口、`fabric.mod.json`、`turtle-reproduce.mixins.json`、`src/client`、全部 GameTest | +| 逐行 diff | `OPTIMIZATION.diff`(+146 / −35 行) | + +### 为什么要改 + +`NestingSiteFinder.findCandidates` 是热点:单次调用要扫 73 × 73 列 × 19 层 ≈ **10.1 万个方块**,而怀卵海龟只要偏离上次搜索原点超过 4 格、或把候选列表消费完,就会整片重扫。原实现每个方块都调用一次 `Level#getBlockState`(内部要重新解析区块、段索引与建筑高度),并为每块沙新建一个 `BlockPos` 对象。 + +### 具体改动 + +1. **按区块段读方块,整段跳过空气段**:改走 `ChunkAccess#getSections()` + `LevelChunkSection#getBlockState()`;对 `hasOnlyAir()` 的段整段跳过。空段里只可能是空气,不可能提供水源或沙地,因此跳过它读不到任何会成为候选的方块。 +2. **区块解析次数由 5329 次降到 ≤36 次**:循环由「列 → 层」改为「区块 → 段 → 方块」,每列只解析一次区块。原来的 `Level#hasChunk(x >> 4, z >> 4)` 换成等价的 `Level#getChunk(cx, cz, ChunkStatus.FULL, false)`——`hasChunk` 内部正是这个调用;`loadOrGenerate = false`,**依然绝不加载或生成区块**。 +3. **沙地候选改用打包 long**:`ArrayList` → fastutil `LongArrayList`(`BlockPos.asLong` / `getX|getY|getZ(long)`),一次扫描不再产生成千上万个临时对象。 +4. **`isValidSite` 去掉重复查询**:提取循环不变量(方块坐标、建筑高度判定),并记住上一个查询过的区块可用性——半径 4 的圆盘最多跨 4 个区块。 + +### 为什么行为不变 + +- 搜索盒子的范围(X/Z ±32 加 4 格水源外扩、Y ±8 加 ±1)以及每一项判定条件与短路顺序**逐条保留**。 +- 候选最终由**同一个比较器**排序,而它以沙地 `x/y/z` 结尾,构成**全序**(不同位置永不相等)。因此结果与扫描的访问顺序无关,排序后的候选列表逐位相同。 +- `javap` 比对:公开方法签名、4 个公开常量值(`SEARCH_RADIUS = 32`、`VERTICAL_SEARCH_RADIUS = 8`、`WATER_RADIUS = 4`、`WATER_VERTICAL_RADIUS = 1`)以及 `Candidate` 记录的成员**完全一致**;唯一差异是一个 `private` 辅助方法的签名,故其余 class(含 4 个 mixin)的链接关系不受影响。 +- 常量池比对:新增的类型引用只有原版 Minecraft 与 fastutil 的类,**没有引入任何新的运行期依赖**。 + +### 验证情况 + +| 项 | 状态 | +|---|---| +| 编译 | ✅ JDK 25,`javac --release 25`;class 文件版本 69,与上游构建一致 | +| 字节码 | ✅ `javap` 确认新逻辑(`getSections` / `hasOnlyAir` / `LongArrayList#getLong` / `getChunk(..., false)`)已进入产物 | +| 链接 | ✅ 以真实 Minecraft 26.1.2 + Fabric API + fastutil 作为 classpath 做 `Class.forName` 反射检查,成员列表与上游逐条一致 | +| 游戏内实测 | ✅ Minecraft 26.1.2 单机:怀卵海龟在本地水岸沙地产卵、蛋数 1~4、`home_pos` 未被改写、距出生地数千格仍能就地产卵 | +| 7 个 GameTest | ⚠️ 未在本机执行(需要完整 Loom 构建并联网拉取依赖)。行为等价性由上述静态论证 + 游戏内实测支撑,建议在能联网的环境跑一次 `.\gradlew.bat build` 复核 | + +## 许可 + +CC0-1.0。 diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..fe357e9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,104 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + +plugins { + id("net.fabricmc.fabric-loom") + `maven-publish` + id("org.jetbrains.kotlin.jvm") version "2.4.20" +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +loom { + splitEnvironmentSourceSets() + + mods { + register("turtle-reproduce") { + sourceSet(sourceSets.main.get()) + sourceSet(sourceSets.getByName("client")) + } + } +} + +fabricApi { + configureDataGeneration { + client = true + modId = "turtle-reproduce" + } + configureTests { + createSourceSet = true + modId = "turtle-reproduce-gametest" + enableGameTests = true + enableClientGameTests = false + } +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft("com.mojang:minecraft:${providers.gradleProperty("minecraft_version").get()}") + implementation("net.fabricmc:fabric-loader:${providers.gradleProperty("loader_version").get()}") + + // Fabric API. This is technically optional, but you probably want it anyway. + implementation("net.fabricmc.fabric-api:fabric-api:${providers.gradleProperty("fabric_api_version").get()}") + implementation("net.fabricmc:fabric-language-kotlin:${providers.gradleProperty("fabric_kotlin_version").get()}") +} + +tasks.processResources { + val version = version + inputs.property("version", version) + + filesMatching("fabric.mod.json") { + expand("version" to version) + } +} + +tasks.withType().configureEach { + options.release = 25 +} + +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_25 + } +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 +} + +tasks.jar { + val projectName = project.name + inputs.property("projectName", projectName) + + from("LICENSE") { + rename { "${it}_$projectName" } + } +} + +// configure the maven publication +publishing { + publications { + register("mavenJava") { + from(components["java"]) + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..9c7c75e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true +org.gradle.configuration-cache=true + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=26.1.2 +loader_version=0.19.5 +loom_version=1.18-SNAPSHOT +fabric_kotlin_version=1.14.1+kotlin.2.4.20 + +# Mod Properties +version=1.0.0 +group=com.mr + +# Dependencies +fabric_api_version=0.155.3+26.1.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..eddabd2eef8d94a5437d6168ff9c87a78ff725b3 GIT binary patch literal 47505 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..a51ec4f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,82 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..bec6812 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } + mavenCentral() + gradlePluginPortal() + } + + plugins { + id("net.fabricmc.fabric-loom") version providers.gradleProperty("loom_version") + } +} + +// Should match your modid +rootProject.name = "turtle-reproduce" diff --git a/src/client/kotlin/com/mr/client/TurtleReproduceClient.kt b/src/client/kotlin/com/mr/client/TurtleReproduceClient.kt new file mode 100644 index 0000000..75a83bf --- /dev/null +++ b/src/client/kotlin/com/mr/client/TurtleReproduceClient.kt @@ -0,0 +1,9 @@ +package com.mr.client + +import net.fabricmc.api.ClientModInitializer + +object TurtleReproduceClient : ClientModInitializer { + override fun onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} \ No newline at end of file diff --git a/src/client/kotlin/com/mr/client/TurtleReproduceDataGenerator.kt b/src/client/kotlin/com/mr/client/TurtleReproduceDataGenerator.kt new file mode 100644 index 0000000..586556b --- /dev/null +++ b/src/client/kotlin/com/mr/client/TurtleReproduceDataGenerator.kt @@ -0,0 +1,9 @@ +package com.mr.client + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator + +object TurtleReproduceDataGenerator : DataGeneratorEntrypoint { + override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) { + } +} \ No newline at end of file diff --git a/src/gametest/java/com/mr/gametest/TurtleNestingGameTests.java b/src/gametest/java/com/mr/gametest/TurtleNestingGameTests.java new file mode 100644 index 0000000..a28bfaf --- /dev/null +++ b/src/gametest/java/com/mr/gametest/TurtleNestingGameTests.java @@ -0,0 +1,202 @@ +package com.mr.gametest; + +import com.mr.mixin.TurtleAccessor; +import net.fabricmc.fabric.api.gametest.v1.GameTest; +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.animal.turtle.Turtle; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.TurtleEggBlock; +import net.minecraft.world.phys.Vec3; + +public class TurtleNestingGameTests { + private static final String SHORE = "turtle-reproduce-gametest:shore"; + + @GameTest(structure = SHORE, maxTicks = 1600) + public void breedingFarFromHomeLaysVanillaEggs(GameTestHelper helper) { + prepareFloor(helper); + makeShore(helper, 8, 9); + Turtle first = spawnTurtle(helper, 4.5, 10.5); + Turtle second = spawnTurtle(helper, 5.5, 10.5); + BlockPos firstHome = accessor(first).turtleReproduce$getHomePos(); + BlockPos secondHome = accessor(second).turtleReproduce$getHomePos(); + boolean[] becamePregnant = {false}; + boolean[] dugSand = {false}; + first.setInLove(null); + second.setInLove(null); + + helper.onEachTick(() -> { + becamePregnant[0] |= first.hasEgg() || second.hasEgg(); + dugSand[0] |= first.isLayingEgg() || second.isLayingEgg(); + assertPregnantTurtleDoesNotGoHome(helper, first); + assertPregnantTurtleDoesNotGoHome(helper, second); + }); + helper.succeedWhen(() -> { + BlockPos eggs = findEggsOnShore(helper, 8, 9); + helper.assertTrue(eggs != null, "The turtles should breed and lay eggs on the nearby shore"); + helper.assertTrue(becamePregnant[0], "Breeding should produce a pregnant turtle"); + helper.assertTrue(dugSand[0], "The turtle should perform the vanilla digging animation"); + helper.assertFalse(first.hasEgg() || second.hasEgg(), "Laying should consume the carried eggs"); + helper.assertValueEqual(accessor(first).turtleReproduce$getHomePos(), firstHome, "First birth position"); + helper.assertValueEqual(accessor(second).turtleReproduce$getHomePos(), secondHome, "Second birth position"); + assertVanillaEggCount(helper, eggs); + }); + } + + @GameTest(structure = SHORE, maxTicks = 1400) + public void choosesTheNearestReachableWaterShore(GameTestHelper helper) { + prepareFloor(helper); + makeShore(helper, 8, 9); + makeShore(helper, 19, 9); + Turtle turtle = spawnPregnantTurtle(helper, 4.5, 10.5); + expectEggs(helper, turtle, 8, 9, 19, 9); + } + + @GameTest(structure = SHORE, maxTicks = 1800) + public void reachesAShoreBeyondTheVanillaSixteenBlockRange(GameTestHelper helper) { + prepareFloor(helper); + makeShore(helper, 22, 9); + Turtle turtle = spawnPregnantTurtle(helper, 3.5, 10.5); + expectEggs(helper, turtle, 22, 9, 8, 9); + } + + // Vanilla turtles move slowly away from home and may pause to retry a long route. + @GameTest(structure = SHORE, maxTicks = 3000) + public void skipsAnEnclosedNearerShore(GameTestHelper helper) { + prepareFloor(helper); + makeShore(helper, 8, 7); + makeShore(helper, 19, 7); + // A three-block-high sealed enclosure makes the nearer sand unreachable. + for (int y = 2; y <= 4; y++) { + for (int x = 5; x <= 12; x++) { + helper.setBlock(x, y, 5, Blocks.STONE); + helper.setBlock(x, y, 12, Blocks.STONE); + } + for (int z = 5; z <= 12; z++) { + helper.setBlock(5, y, z, Blocks.STONE); + helper.setBlock(12, y, z, Blocks.STONE); + } + } + Turtle turtle = spawnPregnantTurtle(helper, 3.5, 8.5); + expectEggs(helper, turtle, 19, 7, 8, 7); + } + + @GameTest(structure = SHORE, maxTicks = 650) + public void keepsEggsWithoutSandAndDoesNotReturnHome(GameTestHelper helper) { + prepareFloor(helper); + makeWater(helper, 8, 9); + Turtle turtle = spawnPregnantTurtle(helper, 4.5, 10.5); + BlockPos home = accessor(turtle).turtleReproduce$getHomePos(); + helper.onEachTick(() -> { + helper.assertTrue(turtle.hasEgg(), "No suitable sand: the turtle must retain its eggs"); + helper.assertFalse(turtle.isLayingEgg(), "The turtle must not dig on stone"); + helper.assertFalse(accessor(turtle).turtleReproduce$isGoingHome(), "Pregnancy must not start a trip home"); + helper.assertValueEqual(accessor(turtle).turtleReproduce$getHomePos(), home, "Birth position"); + }); + helper.runAtTickTime(600, helper::succeed); + } + + @GameTest(structure = SHORE, maxTicks = 650) + public void drySandIsNotANestingShore(GameTestHelper helper) { + prepareFloor(helper); + for (int z = 9; z <= 11; z++) { + helper.setBlock(7, 1, z, Blocks.SAND); + } + Turtle turtle = spawnPregnantTurtle(helper, 4.5, 10.5); + helper.onEachTick(() -> { + helper.assertTrue(turtle.hasEgg(), "Sand without a nearby water source must not consume the eggs"); + helper.assertFalse(turtle.isLayingEgg(), "Dry inland sand is not a valid shore"); + helper.assertFalse(accessor(turtle).turtleReproduce$isGoingHome(), "Pregnancy must not start a trip home"); + }); + helper.runAtTickTime(600, helper::succeed); + } + + private static void expectEggs(GameTestHelper helper, Turtle turtle, + int expectedWaterX, int expectedWaterZ, + int rejectedWaterX, int rejectedWaterZ) { + BlockPos home = accessor(turtle).turtleReproduce$getHomePos(); + boolean[] dugSand = {false}; + helper.onEachTick(() -> { + dugSand[0] |= turtle.isLayingEgg(); + assertPregnantTurtleDoesNotGoHome(helper, turtle); + }); + helper.succeedWhen(() -> { + BlockPos eggs = findEggsOnShore(helper, expectedWaterX, expectedWaterZ); + helper.assertTrue(eggs != null, "The turtle should lay eggs on the selected reachable shore"); + helper.assertTrue(findEggsOnShore(helper, rejectedWaterX, rejectedWaterZ) == null, + "The other shore must not receive eggs"); + helper.assertTrue(dugSand[0], "The turtle should dig before laying"); + helper.assertFalse(turtle.hasEgg(), "The laid eggs should no longer be carried"); + helper.assertValueEqual(accessor(turtle).turtleReproduce$getHomePos(), home, "Birth position"); + assertVanillaEggCount(helper, eggs); + }); + } + + private static Turtle spawnTurtle(GameTestHelper helper, double x, double z) { + Turtle turtle = helper.spawn(EntityType.TURTLE, new Vec3(x, 2, z)); + turtle.setAge(0); + turtle.setPersistenceRequired(); + turtle.getRandom().setSeed(12345L); + turtle.setHomePos(helper.absolutePos(new BlockPos(2048, 2, 2048))); + return turtle; + } + + private static Turtle spawnPregnantTurtle(GameTestHelper helper, double x, double z) { + Turtle turtle = spawnTurtle(helper, x, z); + accessor(turtle).turtleReproduce$setHasEgg(true); + return turtle; + } + + private static void prepareFloor(GameTestHelper helper) { + for (int x = 0; x < 26; x++) { + for (int z = 0; z < 24; z++) { + helper.setBlock(x, 0, z, Blocks.STONE); + helper.setBlock(x, 1, z, Blocks.STONE); + for (int y = 2; y < 6; y++) { + helper.setBlock(x, y, z, Blocks.AIR); + } + } + } + } + + private static void makeShore(GameTestHelper helper, int waterX, int waterZ) { + makeWater(helper, waterX, waterZ); + for (int z = waterZ; z < waterZ + 3; z++) { + helper.setBlock(waterX - 1, 1, z, Blocks.SAND); + } + } + + private static void makeWater(GameTestHelper helper, int waterX, int waterZ) { + for (int x = waterX; x < waterX + 3; x++) { + for (int z = waterZ; z < waterZ + 3; z++) { + helper.setBlock(x, 1, z, Blocks.WATER); + } + } + } + + private static BlockPos findEggsOnShore(GameTestHelper helper, int waterX, int waterZ) { + for (int z = waterZ; z < waterZ + 3; z++) { + BlockPos pos = new BlockPos(waterX - 1, 2, z); + if (helper.getBlockState(pos).is(Blocks.TURTLE_EGG)) { + return pos; + } + } + return null; + } + + private static void assertVanillaEggCount(GameTestHelper helper, BlockPos pos) { + int count = helper.getBlockState(pos).getValue(TurtleEggBlock.EGGS); + helper.assertTrue(count >= 1 && count <= 4, "Vanilla laying should produce one to four hatchable eggs"); + } + + private static void assertPregnantTurtleDoesNotGoHome(GameTestHelper helper, Turtle turtle) { + if (turtle.hasEgg()) { + helper.assertFalse(accessor(turtle).turtleReproduce$isGoingHome(), "A pregnant turtle must ignore its distant home"); + } + } + + private static TurtleAccessor accessor(Turtle turtle) { + return (TurtleAccessor) turtle; + } +} diff --git a/src/gametest/java/com/mr/gametest/WetNestingGameTests.java b/src/gametest/java/com/mr/gametest/WetNestingGameTests.java new file mode 100644 index 0000000..0868fb5 --- /dev/null +++ b/src/gametest/java/com/mr/gametest/WetNestingGameTests.java @@ -0,0 +1,113 @@ +package com.mr.gametest; + +import com.mr.ai.NestingSiteFinder; +import com.mr.mixin.TurtleAccessor; +import java.util.List; +import net.fabricmc.fabric.api.gametest.v1.GameTest; +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.animal.turtle.Turtle; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.TurtleEggBlock; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.pathfinder.Path; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; + +public class WetNestingGameTests { + private static final BlockPos NEAR_SAND = new BlockPos(7, 1, 10); + private static final BlockPos FAR_SAND = new BlockPos(13, 1, 10); + + @GameTest(structure = "turtle-reproduce-gametest:shore", maxTicks = 1800) + public void skipsDrySandWhoseStandingTurtleWouldTouchWater(GameTestHelper helper) { + prepareFloor(helper); + helper.setBlock(NEAR_SAND, Blocks.SAND); + helper.setBlock(FAR_SAND, Blocks.SAND); + helper.setBlock(8, 1, 10, Blocks.WATER); + helper.setBlock(15, 1, 10, Blocks.WATER); + + // The pane's solid shape stays in the middle of its block. The turtle + // only extends 0.1 blocks into that block, touching fluid but no glass. + // Keep the pane north of the sand, outside the eastbound route to the + // fallback, so this tests destination validation rather than navigation + // through a waterlogged block's solid center. + // Place this last without neighbor updates so the fixture's contained + // water is not scheduled to flow across the otherwise dry sand. + helper.getLevel().setBlock(helper.absolutePos(new BlockPos(7, 2, 9)), + Blocks.GLASS_PANE.defaultBlockState().setValue(BlockStateProperties.WATERLOGGED, true), + Block.UPDATE_CLIENTS | Block.UPDATE_KNOWN_SHAPE); + + Turtle turtle = helper.spawn(EntityType.TURTLE, new Vec3(4.5, 2, 10.5)); + turtle.setAge(0); + turtle.setPersistenceRequired(); + turtle.getRandom().setSeed(12345L); + BlockPos home = helper.absolutePos(new BlockPos(2048, 2, 2048)); + turtle.setHomePos(home); + + BlockPos nearAbsolute = helper.absolutePos(NEAR_SAND); + BlockPos farAbsolute = helper.absolutePos(FAR_SAND); + Vec3 nearDestination = Vec3.atBottomCenterOf(nearAbsolute.above()); + AABB nearBounds = turtle.getBoundingBox().move(nearDestination.subtract(turtle.position())); + assertWetButOtherwiseUsable(helper, turtle, nearAbsolute, nearBounds); + + List candidates = NestingSiteFinder.findCandidates(turtle); + helper.assertTrue(!candidates.isEmpty() && candidates.getFirst().sandPos().equals(nearAbsolute), + "The wet standing position must be the first candidate before the body-fluid check"); + helper.assertTrue(candidates.stream().anyMatch(candidate -> candidate.sandPos().equals(farAbsolute)), + "The dry fallback sand must also be a valid shore candidate"); + Path nearPath = turtle.getNavigation().createPath(nearAbsolute.above(), 0, 48); + helper.assertTrue(nearPath != null && nearPath.canReach(), + "The near sand must have a navigation path, so only the body-fluid check rejects it"); + + ((TurtleAccessor) turtle).turtleReproduce$setHasEgg(true); + boolean[] dugSand = {false}; + helper.onEachTick(() -> { + // If the fixture ever floods, fail instead of mistaking ordinary + // invalid sand for the intended bounding-box regression coverage. + assertWetButOtherwiseUsable(helper, turtle, nearAbsolute, nearBounds); + dugSand[0] |= turtle.isLayingEgg(); + if (turtle.hasEgg()) { + helper.assertFalse(((TurtleAccessor) turtle).turtleReproduce$isGoingHome(), + "A pregnant turtle must not return to its distant birth position"); + } + }); + helper.succeedWhen(() -> { + helper.assertTrue(helper.getBlockState(FAR_SAND.above()).is(Blocks.TURTLE_EGG), + "The turtle must lay real eggs on the farther, dry shore"); + helper.assertFalse(helper.getBlockState(NEAR_SAND.above()).is(Blocks.TURTLE_EGG), + "Sand whose standing turtle touches water must not receive eggs"); + helper.assertTrue(dugSand[0], "The turtle must perform the vanilla digging animation"); + helper.assertFalse(turtle.hasEgg(), "Successful laying must consume the carried eggs"); + int eggs = helper.getBlockState(FAR_SAND.above()).getValue(TurtleEggBlock.EGGS); + helper.assertTrue(eggs >= 1 && eggs <= 4, "The result must retain the vanilla egg count"); + helper.assertValueEqual(((TurtleAccessor) turtle).turtleReproduce$getHomePos(), home, + "Birth position"); + }); + } + + private static void assertWetButOtherwiseUsable(GameTestHelper helper, Turtle turtle, + BlockPos nearAbsolute, AABB nearBounds) { + helper.assertTrue(helper.getBlockState(NEAR_SAND.above()).isAir(), + "The near sand's own standing block must remain air"); + helper.assertTrue(NestingSiteFinder.isValidSite(helper.getLevel(), nearAbsolute), + "The near sand must remain valid under the sand, air and source-water rules"); + helper.assertTrue(helper.getLevel().noCollision(turtle, nearBounds), + "No solid collision may explain rejection of the near sand"); + helper.assertTrue(helper.getLevel().containsAnyLiquid(nearBounds.deflate(0.001)), + "The standing turtle's width must overlap the neighboring waterlogged pane's fluid"); + } + + private static void prepareFloor(GameTestHelper helper) { + for (int x = 0; x < 26; x++) { + for (int z = 0; z < 24; z++) { + helper.setBlock(x, 0, z, Blocks.STONE); + helper.setBlock(x, 1, z, Blocks.STONE); + for (int y = 2; y < 6; y++) { + helper.setBlock(x, y, z, Blocks.AIR); + } + } + } + } +} diff --git a/src/gametest/resources/data/turtle-reproduce-gametest/gametest/structure/shore.snbt b/src/gametest/resources/data/turtle-reproduce-gametest/gametest/structure/shore.snbt new file mode 100644 index 0000000..d5ba131 --- /dev/null +++ b/src/gametest/resources/data/turtle-reproduce-gametest/gametest/structure/shore.snbt @@ -0,0 +1,7 @@ +{ + DataVersion: 2730, + size: [26, 6, 24], + data: [{pos: [0, 0, 0], state: "minecraft:air"}], + entities: [], + palette: ["minecraft:air"] +} diff --git a/src/gametest/resources/fabric.mod.json b/src/gametest/resources/fabric.mod.json new file mode 100644 index 0000000..333c7a7 --- /dev/null +++ b/src/gametest/resources/fabric.mod.json @@ -0,0 +1,17 @@ +{ + "schemaVersion": 1, + "id": "turtle-reproduce-gametest", + "version": "1.0.0", + "name": "Turtle Reproduce Game Tests", + "environment": "*", + "entrypoints": { + "fabric-gametest": [ + "com.mr.gametest.TurtleNestingGameTests", + "com.mr.gametest.WetNestingGameTests" + ] + }, + "depends": { + "turtle-reproduce": "*", + "fabric-gametest-api-v1": "*" + } +} diff --git a/src/main/java/com/mr/ai/NestingSiteFinder.java b/src/main/java/com/mr/ai/NestingSiteFinder.java new file mode 100644 index 0000000..37e08da --- /dev/null +++ b/src/main/java/com/mr/ai/NestingSiteFinder.java @@ -0,0 +1,254 @@ +package com.mr.ai; + +import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap; +import it.unimi.dsi.fastutil.longs.LongArrayList; +import net.minecraft.core.BlockPos; +import net.minecraft.core.SectionPos; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.entity.animal.turtle.Turtle; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.TurtleEggBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.LevelChunkSection; +import net.minecraft.world.level.chunk.status.ChunkStatus; +import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.phys.Vec3; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +/** + * Finds dry nesting blocks beside nearby, exposed source water. + * + *

This class was rewritten for throughput. The scan is the hot path: one call + * covers 73 x 73 columns x 19 vertical steps, and a pregnant turtle re-runs it + * whenever it drifts more than four blocks from the previous search origin or + * exhausts its cached candidate list. + * + *

Every result-affecting rule is unchanged: + *

    + *
  • the same box is visited (32 in X/Z for nests, plus a 4 block halo for + * water, 8 up/down for nests, plus 1 for water);
  • + *
  • the same conditions are tested, in the same order;
  • + *
  • unloaded chunks are still skipped, and are still never loaded or + * generated ({@code loadOrGenerate = false});
  • + *
  • the candidate list is still ordered by the same comparator, which ends + * in the block coordinates and therefore is a total order. Visit order no + * longer matters, so the sort result is identical.
  • + *
+ * + *

What changed, and why it is equivalent: + *

    + *
  • blocks are read through the chunk section that holds them instead of + * {@code Level#getBlockState}, which re-resolves the chunk, the section + * index and the build-height check on every single block. Sections that + * {@code hasOnlyAir()} are skipped entirely: they cannot contribute water + * or sand;
  • + *
  • the same availability test as {@code Level#hasChunk} is used, but the + * resolved chunk is kept for the section reads instead of being thrown + * away and looked up again per block;
  • + *
  • sand positions are collected as packed longs instead of thousands of + * {@code BlockPos} objects, so a scan allocates no per-block garbage;
  • + *
  • {@code isValidSite} hoists its loop invariants and remembers the last + * chunk availability answer; the disk it walks spans at most four chunks, + * so this only removes repeated lookups.
  • + *
+ */ +public final class NestingSiteFinder { + public static final int SEARCH_RADIUS = 32; + public static final int VERTICAL_SEARCH_RADIUS = 8; + public static final int WATER_RADIUS = 4; + public static final int WATER_VERTICAL_RADIUS = 1; + + private static final Comparator CANDIDATE_ORDER = Comparator + .comparingDouble(Candidate::waterDistanceSquared) + .thenComparingDouble(Candidate::sandDistanceSquared) + .thenComparingInt(candidate -> candidate.sandPos().getX()) + .thenComparingInt(candidate -> candidate.sandPos().getY()) + .thenComparingInt(candidate -> candidate.sandPos().getZ()); + + private NestingSiteFinder() { + } + + /** + * Searches a square extending 32 blocks in X/Z and 8 blocks in Y from the + * turtle. A four-block halo includes water beside nests at the boundary. + * The caller must check the turtle's collision box and navigation path. + */ + public static List findCandidates(Turtle turtle) { + Level level = turtle.level(); + BlockPos origin = turtle.blockPosition(); + int originX = origin.getX(); + int originY = origin.getY(); + int originZ = origin.getZ(); + int scanRadius = SEARCH_RADIUS + WATER_RADIUS; + int minY = Math.max(level.getMinY(), originY - VERTICAL_SEARCH_RADIUS - WATER_VERTICAL_RADIUS); + int maxY = Math.min(level.getMaxY() - 1, originY + VERTICAL_SEARCH_RADIUS + WATER_VERTICAL_RADIUS); + int nestMinX = originX - SEARCH_RADIUS; + int nestMaxX = originX + SEARCH_RADIUS; + int nestMinZ = originZ - SEARCH_RADIUS; + int nestMaxZ = originZ + SEARCH_RADIUS; + int nestMinY = originY - VERTICAL_SEARCH_RADIUS; + int nestMaxY = originY + VERTICAL_SEARCH_RADIUS; + + BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); + LongArrayList sandBlocks = new LongArrayList(); + Long2DoubleOpenHashMap waterDistances = new Long2DoubleOpenHashMap(); + waterDistances.defaultReturnValue(Double.POSITIVE_INFINITY); + + // Read each block once, instead of repeatedly querying the world around + // every sand block. Unloaded chunks are never requested or generated. + if (minY <= maxY) { + Vec3 turtlePos = turtle.position(); + int minSection = level.getSectionIndex(minY); + int maxSection = level.getSectionIndex(maxY); + for (int chunkX = (originX - scanRadius) >> 4; chunkX <= (originX + scanRadius) >> 4; chunkX++) { + int fromX = Math.max(originX - scanRadius, chunkX << 4); + int toX = Math.min(originX + scanRadius, (chunkX << 4) + 15); + for (int chunkZ = (originZ - scanRadius) >> 4; chunkZ <= (originZ + scanRadius) >> 4; chunkZ++) { + // The same test Level#hasChunk performs, except the chunk is + // kept: loadOrGenerate = false never loads or generates. + ChunkAccess chunk = level.getChunk(chunkX, chunkZ, ChunkStatus.FULL, false); + if (chunk == null) { + continue; + } + int fromZ = Math.max(originZ - scanRadius, chunkZ << 4); + int toZ = Math.min(originZ + scanRadius, (chunkZ << 4) + 15); + LevelChunkSection[] sections = chunk.getSections(); + for (int sectionIndex = minSection; sectionIndex <= maxSection; sectionIndex++) { + if (sectionIndex < 0 || sectionIndex >= sections.length) { + continue; + } + LevelChunkSection section = sections[sectionIndex]; + // An all-air section holds neither water nor sand, so + // skipping it reads no block the loops could have used. + if (section == null || section.hasOnlyAir()) { + continue; + } + int sectionMinY = SectionPos.sectionToBlockCoord(level.getMinSectionY() + sectionIndex); + int fromY = Math.max(minY, sectionMinY); + int toY = Math.min(maxY, sectionMinY + 15); + boolean nestSection = fromY <= nestMaxY && toY >= nestMinY; + for (int x = fromX; x <= toX; x++) { + int localX = x & 15; + boolean nestX = x >= nestMinX && x <= nestMaxX; + for (int z = fromZ; z <= toZ; z++) { + boolean inNestRange = nestSection && nestX && z >= nestMinZ && z <= nestMaxZ; + int localZ = z & 15; + for (int y = fromY; y <= toY; y++) { + BlockState state = section.getBlockState(localX, y & 15, localZ); + if (isExposedSourceWater(level, cursor, x, y, z, state)) { + cursor.set(x, y, z); + waterDistances.put(BlockPos.asLong(x, y, z), + cursor.distToCenterSqr(turtlePos)); + } + if (inNestRange && y >= nestMinY && y <= nestMaxY + && state.is(BlockTags.SAND) + && level.isEmptyBlock(cursor.set(x, y + 1, z))) { + sandBlocks.add(BlockPos.asLong(x, y, z)); + } + } + } + } + } + } + } + } + + List candidates = new ArrayList<>(); + if (waterDistances.isEmpty()) { + return candidates; + } + Vec3 turtlePos = turtle.position(); + for (int index = 0; index < sandBlocks.size(); index++) { + long packedSand = sandBlocks.getLong(index); + int sandX = BlockPos.getX(packedSand); + int sandY = BlockPos.getY(packedSand); + int sandZ = BlockPos.getZ(packedSand); + double nearestWaterDistance = Double.POSITIVE_INFINITY; + for (int dx = -WATER_RADIUS; dx <= WATER_RADIUS; dx++) { + for (int dz = -WATER_RADIUS; dz <= WATER_RADIUS; dz++) { + if (dx * dx + dz * dz > WATER_RADIUS * WATER_RADIUS) { + continue; + } + for (int dy = -WATER_VERTICAL_RADIUS; dy <= WATER_VERTICAL_RADIUS; dy++) { + long waterPosition = BlockPos.asLong(sandX + dx, sandY + dy, sandZ + dz); + nearestWaterDistance = Math.min(nearestWaterDistance, waterDistances.get(waterPosition)); + } + } + } + if (Double.isFinite(nearestWaterDistance)) { + cursor.set(sandX, sandY, sandZ); + candidates.add(new Candidate(new BlockPos(sandX, sandY, sandZ), nearestWaterDistance, + cursor.distToCenterSqr(turtlePos))); + } + } + candidates.sort(CANDIDATE_ORDER); + return candidates; + } + + /** Rechecks a chosen nest, including changes to its sand, air, or water. */ + public static boolean isValidSite(LevelReader level, BlockPos sandPos) { + if (!level.isInsideBuildHeight(sandPos) || !level.isInsideBuildHeight(sandPos.above()) + || !level.hasChunkAt(sandPos) + || !TurtleEggBlock.isSand(level, sandPos) + || !level.isEmptyBlock(sandPos.above())) { + return false; + } + int sandX = sandPos.getX(); + int sandY = sandPos.getY(); + int sandZ = sandPos.getZ(); + BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); + int lastChunkX = Integer.MIN_VALUE; + int lastChunkZ = Integer.MIN_VALUE; + boolean lastChunkLoaded = false; + for (int dx = -WATER_RADIUS; dx <= WATER_RADIUS; dx++) { + for (int dz = -WATER_RADIUS; dz <= WATER_RADIUS; dz++) { + if (dx * dx + dz * dz > WATER_RADIUS * WATER_RADIUS) { + continue; + } + int x = sandX + dx; + int z = sandZ + dz; + int chunkX = x >> 4; + int chunkZ = z >> 4; + // The disk above spans at most four chunks, so this only removes + // repeated queries for columns that share a chunk. + if (chunkX != lastChunkX || chunkZ != lastChunkZ) { + lastChunkX = chunkX; + lastChunkZ = chunkZ; + lastChunkLoaded = level.hasChunk(chunkX, chunkZ); + } + if (!lastChunkLoaded) { + continue; + } + for (int dy = -WATER_VERTICAL_RADIUS; dy <= WATER_VERTICAL_RADIUS; dy++) { + int y = sandY + dy; + cursor.set(x, y, z); + if (level.isInsideBuildHeight(y) && level.isInsideBuildHeight(y + 1) + && isExposedSourceWater(level, cursor, x, y, z, level.getBlockState(cursor))) { + return true; + } + } + } + } + return false; + } + + private static boolean isExposedSourceWater(LevelReader level, BlockPos.MutableBlockPos cursor, + int x, int y, int z, BlockState state) { + // Requiring a liquid block excludes waterlogged fences, slabs and other + // solid blocks even though their fluid state may report source water. + if (!state.liquid()) { + return false; + } + FluidState fluid = state.getFluidState(); + return fluid.is(FluidTags.WATER) && fluid.isSource() && level.isEmptyBlock(cursor.set(x, y + 1, z)); + } + + public record Candidate(BlockPos sandPos, double waterDistanceSquared, double sandDistanceSquared) { + } +} diff --git a/src/main/java/com/mr/mixin/PathNavigationAccessor.java b/src/main/java/com/mr/mixin/PathNavigationAccessor.java new file mode 100644 index 0000000..f8c4a0a --- /dev/null +++ b/src/main/java/com/mr/mixin/PathNavigationAccessor.java @@ -0,0 +1,11 @@ +package com.mr.mixin; + +import net.minecraft.world.entity.ai.navigation.PathNavigation; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(PathNavigation.class) +public interface PathNavigationAccessor { + @Accessor("maxVisitedNodesMultiplier") + float turtleReproduce$getMaxVisitedNodesMultiplier(); +} diff --git a/src/main/java/com/mr/mixin/TurtleAccessor.java b/src/main/java/com/mr/mixin/TurtleAccessor.java new file mode 100644 index 0000000..c498dea --- /dev/null +++ b/src/main/java/com/mr/mixin/TurtleAccessor.java @@ -0,0 +1,22 @@ +package com.mr.mixin; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.animal.turtle.Turtle; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(Turtle.class) +public interface TurtleAccessor { + @Invoker("setHasEgg") + void turtleReproduce$setHasEgg(boolean hasEgg); + + @Invoker("setLayingEgg") + void turtleReproduce$setLayingEgg(boolean layingEgg); + + @Accessor("homePos") + BlockPos turtleReproduce$getHomePos(); + + @Accessor("goingHome") + boolean turtleReproduce$isGoingHome(); +} diff --git a/src/main/java/com/mr/mixin/TurtleGoHomeGoalMixin.java b/src/main/java/com/mr/mixin/TurtleGoHomeGoalMixin.java new file mode 100644 index 0000000..6bb5657 --- /dev/null +++ b/src/main/java/com/mr/mixin/TurtleGoHomeGoalMixin.java @@ -0,0 +1,32 @@ +package com.mr.mixin; + +import net.minecraft.world.entity.animal.turtle.Turtle; +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.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(targets = "net.minecraft.world.entity.animal.turtle.Turtle$TurtleGoHomeGoal") +public abstract class TurtleGoHomeGoalMixin { + @Shadow @Final + private Turtle turtle; + + // This goal has no MOVE flag, so priority alone cannot stop it fighting nesting. + @Inject(method = {"canUse", "canContinueToUse"}, at = @At("HEAD"), cancellable = true) + private void turtleReproduce$stayLocalWhileCarryingEggs(CallbackInfoReturnable cir) { + if (this.turtle.hasEgg()) { + cir.setReturnValue(false); + } + } + + @Inject(method = "stop", at = @At("TAIL")) + private void turtleReproduce$discardOldHomeRoute(CallbackInfo ci) { + if (this.turtle.hasEgg()) { + // The vanilla stop only clears goingHome, leaving its last route active. + this.turtle.getNavigation().stop(); + } + } +} diff --git a/src/main/java/com/mr/mixin/TurtleLayEggGoalMixin.java b/src/main/java/com/mr/mixin/TurtleLayEggGoalMixin.java new file mode 100644 index 0000000..a1fd772 --- /dev/null +++ b/src/main/java/com/mr/mixin/TurtleLayEggGoalMixin.java @@ -0,0 +1,129 @@ +package com.mr.mixin; + +import com.mr.ai.NestingSiteFinder; +import java.util.List; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.PathfinderMob; +import net.minecraft.world.entity.ai.goal.MoveToBlockGoal; +import net.minecraft.world.entity.ai.navigation.PathNavigation; +import net.minecraft.world.entity.animal.turtle.Turtle; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.pathfinder.Path; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(targets = "net.minecraft.world.entity.animal.turtle.Turtle$TurtleLayEggGoal") +public abstract class TurtleLayEggGoalMixin extends MoveToBlockGoal { + @Unique private static final int PATH_SEARCH_RANGE = 48; + @Unique private static final int PATH_ATTEMPTS_PER_CHECK = 16; + + @Shadow @Final + private Turtle turtle; + @Unique private List turtleReproduce$candidates = List.of(); + @Unique private int turtleReproduce$candidateIndex; + @Unique private BlockPos turtleReproduce$searchOrigin = BlockPos.ZERO; + @Unique private Path turtleReproduce$nestingPath; + + protected TurtleLayEggGoalMixin(PathfinderMob mob, double speed, int range) { + super(mob, speed, range); + } + + @Inject(method = "canUse", at = @At("HEAD"), cancellable = true) + private void turtleReproduce$findLocalShore(CallbackInfoReturnable cir) { + cir.setReturnValue(this.turtle.hasEgg() && !this.turtle.isBaby() && super.canUse()); + } + + @Inject(method = "canContinueToUse", at = @At("HEAD"), cancellable = true) + private void turtleReproduce$continueAwayFromHome(CallbackInfoReturnable cir) { + cir.setReturnValue(this.turtle.hasEgg() && super.canContinueToUse()); + } + + @Inject(method = "isValidTarget", at = @At("HEAD"), cancellable = true) + private void turtleReproduce$requireDrySandNearWater(LevelReader level, BlockPos pos, + CallbackInfoReturnable cir) { + cir.setReturnValue(NestingSiteFinder.isValidSite(level, pos)); + } + + @Override + protected boolean findNearestBlock() { + if (this.turtleReproduce$candidateIndex >= this.turtleReproduce$candidates.size() + || this.turtle.blockPosition().distSqr(this.turtleReproduce$searchOrigin) > 16.0) { + this.turtleReproduce$candidates = NestingSiteFinder.findCandidates(this.turtle); + this.turtleReproduce$candidateIndex = 0; + this.turtleReproduce$searchOrigin = this.turtle.blockPosition(); + } + + // Spread expensive path checks over AI updates when a shore is inaccessible. + int attempts = 0; + while (this.turtleReproduce$candidateIndex < this.turtleReproduce$candidates.size() + && attempts++ < PATH_ATTEMPTS_PER_CHECK) { + BlockPos sand = this.turtleReproduce$candidates.get(this.turtleReproduce$candidateIndex++).sandPos(); + if (!this.turtle.isWithinHome(sand) || !NestingSiteFinder.isValidSite(this.turtle.level(), sand)) { + continue; + } + Vec3 destination = Vec3.atBottomCenterOf(sand.above()); + AABB destinationBounds = this.turtle.getBoundingBox().move(destination.subtract(this.turtle.position())); + // Adult turtles are wider than one block. An air block alone does not + // guarantee that their body is clear of adjacent water or walls. + if (!this.turtle.level().noCollision(this.turtle, destinationBounds) + || this.turtle.level().containsAnyLiquid(destinationBounds.deflate(0.001))) { + continue; + } + Path path = this.turtleReproduce$createNestingPath(sand.above()); + if (path != null && path.canReach()) { + this.blockPos = sand; + this.turtleReproduce$nestingPath = path; + this.turtleReproduce$candidates = List.of(); + return true; + } + } + if (this.turtleReproduce$candidateIndex < this.turtleReproduce$candidates.size()) { + this.nextStartTick = 1; + } + return false; + } + + @Unique + private Path turtleReproduce$createNestingPath(BlockPos destination) { + PathNavigation navigation = this.turtle.getNavigation(); + float previousMultiplier = ((PathNavigationAccessor) navigation).turtleReproduce$getMaxVisitedNodesMultiplier(); + // A larger distance alone leaves vanilla's small node budget unchanged, + // incorrectly rejecting shores that require a detour around an obstacle. + navigation.setMaxVisitedNodesMultiplier(Math.max(previousMultiplier, 8.0F)); + try { + return navigation.createPath(destination, 0, PATH_SEARCH_RANGE); + } finally { + navigation.setMaxVisitedNodesMultiplier(previousMultiplier); + } + } + + @Override + protected void moveMobToBlock() { + this.turtle.getNavigation().moveTo(this.turtleReproduce$nestingPath, this.speedModifier); + } + + @Inject(method = "tick", at = @At("TAIL")) + private void turtleReproduce$retryLongerPath(CallbackInfo ci) { + if (!this.isReachedTarget() && this.tryTicks % 40 == 0 && this.turtle.getNavigation().isDone()) { + this.turtleReproduce$nestingPath = this.turtleReproduce$createNestingPath(this.blockPos.above()); + this.moveMobToBlock(); + } + } + + @Override + public void stop() { + super.stop(); + this.turtle.getNavigation().stop(); + ((TurtleAccessor) this.turtle).turtleReproduce$setLayingEgg(false); + this.turtleReproduce$nestingPath = null; + this.turtleReproduce$candidates = List.of(); + } +} diff --git a/src/main/kotlin/com/mr/TurtleReproduce.kt b/src/main/kotlin/com/mr/TurtleReproduce.kt new file mode 100644 index 0000000..35bca5e --- /dev/null +++ b/src/main/kotlin/com/mr/TurtleReproduce.kt @@ -0,0 +1,18 @@ +package com.mr + +import net.fabricmc.api.ModInitializer +import net.minecraft.resources.Identifier +import org.slf4j.LoggerFactory + +object TurtleReproduce : ModInitializer { + const val MOD_ID: String = "turtle-reproduce" + + private val LOGGER = LoggerFactory.getLogger(MOD_ID) + + override fun onInitialize() { + LOGGER.info("Turtle Reproduce: local waterside nesting enabled") + } + + fun id(path: String): Identifier + = Identifier.fromNamespaceAndPath(MOD_ID, path) +} diff --git a/src/main/resources/assets/turtle-reproduce/icon.png b/src/main/resources/assets/turtle-reproduce/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..de38279668a709d26c36bab795cfb41f32934bb1 GIT binary patch literal 2647 zcmeH{`8U*UAIGnmvBikWI$1`9>|3@PGbD^XOR21po05IYgt0b6vX-)Et&AnxZ5?zY zl5QlGWkPn5Z7`Pm`#k6Q6Q1X{=Q`)QKIe1JwS3O!{k~pt=BE1WtSD9h06X45*8+;f ze@zx9XzkQ;>VpEz&q7}ZkUt760Kj?zud8hpY`>BnK(fBc)%At1bTnHsQ2N%Ra#DQx z==f;d?!y9-thj1mkh2pntE!YZX?%QRhbOBqlRo?Lh1&FTeJ=e1nx^45V1Kt_wf>ri z5Fd|_kdWMitVA3i%=;=~Tpi|pGaOEBIAkD#%47b|VcWp8Z$SK$&+ah*qhg5Pk(JEQ zj>i#?m&^bQScPS|5;4S~bw8xPZ5SK}f;p(Fh-KK=NUn3<^xi1|rw~91zas~=W?ujy z_%s)Af(b-JKOlhmtvSB=f4{RPL~&;tMX1YSyK&t=B>)4F20WE1LX>+48cdpGEDQ~r znZ5s0isFB(lp`z?weP9?;45qCGOMx_BuYgR-4(;eTd1ETR863HzJI1TEi6BnEUI4^ zv^wFtv*t8SXTJ`YvuhOl{K`7@ONGNjt~{HnTZ{hRYTTX01|M<=7uvUkSd^Fw@~e8- zI3{La2r|so3Z40oshpzWH_KPv60~YxcC((``a;1;r_B0whHqV1Q zlh5{ePZE=av8+A&`@3(+p>rPvGu3?xkiuHFzH=YTu}0aNwN_-?>j;5V2{{c_gNZ#Ge0^XHkNe6uywy1S0{8Eg2UYP5Dp;m-X6|Z*f zN8z*7tBQBdT#oN~EOtUZgMg$!mcS0U+waKraMV^u==(U{<%t-j67QIB2d$ajE zCpN7Uy2j0&{a0$`_V4NL+gppD_nMg4QS)>tOY+6$!?{-!6|9)%KjlY}R~SDZVfF>i zPSI(rgOyH~0@n6-H@=Nw?yu_#VZ&sg178v%ms7CeVdrktxG{ji60-`p2$dx)7Rm3@ zn|7{I?p>5ZGNv75UA%9>XxHGKA4z03KO>s=B_h0s&py*2RXj0G`kHBqgc%vG<3fVx z1BDTNjSo4Prr|f&Ey)gTWE|P9>FV3#BaEf@H)gH9V~-0;Id>%_Lj@T@z2-VY@m(5` z)$o~$CL;i+aQM-wtg}@-%N-7HB0Ax2P5uife}?I#x7fgdwzh91!!aE=QO{$%F#t6~ zmC!s(g=9um@+-T#QGW|)`Wt|W2n4g3S8oq_9$vc9? zPWmGr*}(+j5F#0H<>7>*WPl=JYq3az4dextI<&QRuyJ~gHHbh4{gPYZ&}JXHrq(`@ z<2(C---fr9N(kmyEAWZ+?qRXvZQ)jeXy=AtK8{qO9P*v_ny}5!RB(#y666R=+L?~K zgY6+FW2)d3KRNx!0wOTdD=*0IF`g`&d)>J3W0W`wz9UY*S9fGhsjn;X^v~t5Z>2J5 zGrj3XrrDZj`!ZyQxDwl(*;yw4^qZs5DvvY7t`6j2hJ2%q8PVSHY& z_X)#TqRnFZi>O!HVzr(5Ml@egCfY6+m}@}V|zjSlnB~jp-0B%kIB|hRuE}j zd*`!(T5M_{eS3w%1z<2(H5;lI@`!sN?h+|A-b}@}GAigHlD_~@^i^zamLTOr;*HWI z^8-dtv14LrIB!xCG9utfNAmr(AeE{fH;5=B9!zdIKi)bL9ys4Yd;;t-OR6@fA| z)>2n6SeVB=Dc=_rqcl9&t#(Da$SfaYhV%3C+8!pWzdDF+eDg>Z=0.19.5", + "minecraft": "~26.1.2", + "java": ">=25", + "fabric-api": "*", + "fabric-language-kotlin": "*" + } +} diff --git a/src/main/resources/turtle-reproduce.mixins.json b/src/main/resources/turtle-reproduce.mixins.json new file mode 100644 index 0000000..27d6864 --- /dev/null +++ b/src/main/resources/turtle-reproduce.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "package": "com.mr.mixin", + "compatibilityLevel": "JAVA_25", + "mixins": [ + "PathNavigationAccessor", + "TurtleAccessor", + "TurtleGoHomeGoalMixin", + "TurtleLayEggGoalMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +}