Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

fix async-target-finding

Browse Source
This commit is contained in:
hayanesuru
2025-05-14 00:41:32 +09:00
parent 0bdfeeb528
commit 63edc90be8
6 changed files with 448 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

679
leaf-server/minecraft-patches/features/0154-Async-target-finding.patch
View File

File diff suppressed because it is too large Load Diff

10
leaf-server/minecraft-patches/features/0162-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Sakura: copy-EntityList-implementation-to-BasicEntityList
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
index b6af8da084c83ee38bb3ecea6a98feb0c1c74d2a..4311309f14c069f929ffe86bf0a91d7df3222828 100644
index 635d6aabbbe9be5c81a71d5e5bf758211deec0cf..a45f4eb235a7823fce84948ad556c36d9fc6fdd8 100644
--- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
@@ -382,6 +382,13 @@ public final class ChunkEntitySlices {
@@ -414,6 +414,13 @@ public final class ChunkEntitySlices {
private E[] storage;
private int size;
@@ -22,7 +22,7 @@ index b6af8da084c83ee38bb3ecea6a98feb0c1c74d2a..4311309f14c069f929ffe86bf0a91d7d
public BasicEntityList() {
this(0);
@@ -402,6 +409,7 @@ public final class ChunkEntitySlices {
@@ -434,6 +441,7 @@ public final class ChunkEntitySlices {
private void resize() {
if (this.storage == me.titaniumtown.ArrayConstants.emptyEntityArray) { // Gale - JettPack - reduce array allocations
this.storage = (E[])new Entity[DEFAULT_CAPACITY];
@@ -30,7 +30,7 @@ index b6af8da084c83ee38bb3ecea6a98feb0c1c74d2a..4311309f14c069f929ffe86bf0a91d7d
} else {
this.storage = Arrays.copyOf(this.storage, this.storage.length * 2);
}
@@ -415,6 +423,7 @@ public final class ChunkEntitySlices {
@@ -447,6 +455,7 @@ public final class ChunkEntitySlices {
} else {
this.storage[idx] = entity;
}
@@ -38,7 +38,7 @@ index b6af8da084c83ee38bb3ecea6a98feb0c1c74d2a..4311309f14c069f929ffe86bf0a91d7d
}
public int indexOf(final E entity) {
@@ -430,24 +439,32 @@ public final class ChunkEntitySlices {
@@ -462,24 +471,32 @@ public final class ChunkEntitySlices {
}
public boolean remove(final E entity) {

84
leaf-server/src/main/java/org/dreeam/leaf/async/ai/AsyncGoalExecutor.java
View File

@@ -13,19 +13,19 @@ import java.util.concurrent.locks.LockSupport;
public class AsyncGoalExecutor {
public static final Logger LOGGER = LogManager.getLogger("Leaf Async Goal");
protected static final Logger LOGGER = LogManager.getLogger("Leaf Async Goal");
protected final SpscIntQueue queue;
protected final SpscIntQueue wake;
protected final SpscIntQueue submit;
private final AsyncGoalThread thread;
private final ServerLevel world;
private boolean dirty = false;
private long tickCount = 0L;
private long midTickCount = 0L;
public AsyncGoalExecutor(AsyncGoalThread thread, ServerLevel world) {
this.world = world;
this.queue = new SpscIntQueue(AsyncTargetFinding.queueSize);
this.wake = new SpscIntQueue(AsyncTargetFinding.queueSize);
this.submit = new SpscIntQueue(AsyncTargetFinding.queueSize);
this.thread = thread;
}
@@ -34,24 +34,33 @@ public class AsyncGoalExecutor {
if (entity == null || entity.isRemoved() || !(entity instanceof Mob mob)) {
return false;
}
mob.goalSelector.wake();
mob.targetSelector.wake();
mob.goalSelector.ctx.wake();
mob.targetSelector.ctx.wake();
return true;
}
public final void submit(int entityId) {
dirty = true;
if (!this.queue.send(entityId)) {
unpark();
do {
if (!this.submit.send(entityId)) {
while (poll(entityId)) {
wake(entityId);
} while (poll(entityId));
}
}
}
public final void unpark() {
if (dirty) LockSupport.unpark(thread);
dirty = false;
public final void tick() {
while (true) {
OptionalInt result = this.submit.recv();
if (result.isEmpty()) {
break;
}
int id = result.getAsInt();
if (poll(id) && !this.queue.send(id)) {
do {
wake(id);
} while (poll(id));
}
}
LockSupport.unpark(thread);
}
public final void midTick() {
@@ -61,26 +70,51 @@ public class AsyncGoalExecutor {
break;
}
int id = result.getAsInt();
if (poll(id)) {
submit(id);
if (poll(id) && !this.queue.send(id)) {
do {
wake(id);
} while (poll(id));
}
}
if ((tickCount % AsyncTargetFinding.threshold) == 0L) {
unpark();
if (AsyncTargetFinding.threshold <= 0L || (midTickCount % AsyncTargetFinding.threshold) == 0L) {
boolean submitted = false;
while (true) {
OptionalInt result = this.submit.recv();
if (result.isEmpty()) {
break;
}
submitted = true;
int id = result.getAsInt();
if (poll(id) && !this.queue.send(id)) {
do {
wake(id);
} while (poll(id));
}
}
if (submitted) {
LockSupport.unpark(thread);
}
}
tickCount += 1;
midTickCount += 1;
}
private boolean poll(int id) {
Entity entity = this.world.getEntities().get(id);
if (entity == null || !entity.isAlive() || !(entity instanceof Mob mob)) {
if (entity == null || entity.isRemoved() || !(entity instanceof Mob mob)) {
return false;
}
mob.tickingTarget = true;
boolean a = mob.targetSelector.poll();
mob.tickingTarget = false;
boolean b = mob.goalSelector.poll();
return a || b;
try {
mob.tickingTarget = true;
boolean a = mob.targetSelector.poll();
mob.tickingTarget = false;
boolean b = mob.goalSelector.poll();
return a || b;
} catch (Exception e) {
LOGGER.error("Exception while polling", e);
// retry
return true;
}
}
}

8
leaf-server/src/main/java/org/dreeam/leaf/async/ai/VWaker.java Normal file
View File

@@ -0,0 +1,8 @@
package org.dreeam.leaf.async.ai;
import org.jetbrains.annotations.Nullable;
@FunctionalInterface
public interface VWaker {
@Nullable Object wake();
}

16
leaf-server/src/main/java/org/dreeam/leaf/async/ai/Waker.java
View File

@@ -5,14 +5,26 @@ import org.jetbrains.annotations.Nullable;
public class Waker {
@Nullable
public volatile Runnable wake = null;
public volatile VWaker wake = null;
@Nullable
public volatile Object result = null;
public volatile boolean state = true;
public boolean state = true;
public final @Nullable Object result() {
Object result = this.result;
this.result = null;
return result;
}
final void wake() {
final var wake = this.wake;
if (wake != null) {
try {
this.result = wake.wake();
} catch (Exception e) {
AsyncGoalExecutor.LOGGER.error("Exception while wake", e);
}
this.wake = null;
}
}
}

4
leaf-server/src/main/java/org/dreeam/leaf/config/modules/async/AsyncTargetFinding.java
View File

@@ -34,8 +34,6 @@ public class AsyncTargetFinding extends ConfigModules {
asyncTargetFindingInitialized = true;
enabled = config.getBoolean(getBasePath() + ".enabled", enabled);
// TODO
enabled = false;
alertOther = config.getBoolean(getBasePath() + ".async-alert-other", true);
searchBlock = config.getBoolean(getBasePath() + ".async-search-block", true);
searchEntity = config.getBoolean(getBasePath() + ".async-search-entity", true);
@@ -45,7 +43,7 @@ public class AsyncTargetFinding extends ConfigModules {
if (queueSize <= 0) {
queueSize = 4096;
}
if (threshold <= 0L) {
if (threshold == 0L) {
threshold = 10L;
}
if (!enabled) {