mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
81 lines
3.9 KiB
Diff
81 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
|
Date: Sat, 26 Oct 2024 00:06:04 +0800
|
|
Subject: [PATCH] Remove stream in Brain
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/Brain.java b/src/main/java/net/minecraft/world/entity/ai/Brain.java
|
|
index 2ae8c9d56d88987b750e57025d313cfa9300c7e4..88ba505fc5ca084317aaf6be402472ccd42413d8 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/Brain.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/Brain.java
|
|
@@ -69,13 +69,22 @@ public class Brain<E extends LivingEntity> {
|
|
mutableObject.setValue(
|
|
(new MapCodec<Brain<E>>() {
|
|
public <T> Stream<T> keys(DynamicOps<T> dynamicOps) {
|
|
- return memoryModules.stream()
|
|
- .flatMap(
|
|
- memoryType -> memoryType.getCodec()
|
|
- .map(codec -> BuiltInRegistries.MEMORY_MODULE_TYPE.getKey((MemoryModuleType<?>)memoryType))
|
|
- .stream()
|
|
- )
|
|
- .map(id -> dynamicOps.createString(id.toString()));
|
|
+ // Leaf start - Remove stream in Brain
|
|
+ List<T> results = new java.util.ArrayList<>();
|
|
+
|
|
+ for (MemoryModuleType<?> memoryType : memoryModules) {
|
|
+ final Optional<?> codec = memoryType.getCodec();
|
|
+
|
|
+ if (codec.isPresent()) {
|
|
+ final net.minecraft.resources.ResourceLocation id = BuiltInRegistries.MEMORY_MODULE_TYPE.getKey(memoryType);
|
|
+ final T ops = dynamicOps.createString(id.toString());
|
|
+
|
|
+ results.add(ops);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return results.stream();
|
|
+ // Leaf end - Remove stream in Brain
|
|
}
|
|
|
|
public <T> DataResult<Brain<E>> decode(DynamicOps<T> dynamicOps, MapLike<T> mapLike) {
|
|
@@ -110,7 +119,8 @@ public class Brain<E extends LivingEntity> {
|
|
}
|
|
|
|
public <T> RecordBuilder<T> encode(Brain<E> brain, DynamicOps<T> dynamicOps, RecordBuilder<T> recordBuilder) {
|
|
- brain.memories().forEach(entry -> entry.serialize(dynamicOps, recordBuilder));
|
|
+ brain.serializeMemories(dynamicOps, recordBuilder); // Leaf - Remove stream in Brain
|
|
+
|
|
return recordBuilder;
|
|
}
|
|
})
|
|
@@ -152,8 +162,28 @@ public class Brain<E extends LivingEntity> {
|
|
}
|
|
|
|
Stream<Brain.MemoryValue<?>> memories() {
|
|
- return this.memories.entrySet().stream().map(entry -> Brain.MemoryValue.createUnchecked(entry.getKey(), entry.getValue()));
|
|
+ // Leaf start - Remove stream in Brain
|
|
+ return memoriesList().stream();
|
|
+ }
|
|
+
|
|
+ List<Brain.MemoryValue<?>> memoriesList() {
|
|
+ List<Brain.MemoryValue<?>> result = new java.util.ArrayList<>();
|
|
+
|
|
+ for (Entry<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> entry : this.memories.entrySet()) {
|
|
+ result.add(Brain.MemoryValue.createUnchecked(entry.getKey(), entry.getValue()));
|
|
+ }
|
|
+
|
|
+ return result;
|
|
+ }
|
|
+
|
|
+ <T> void serializeMemories(DynamicOps<T> dynamicOps, RecordBuilder<T> recordBuilder) {
|
|
+ for (Entry<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> entry : this.memories.entrySet()) {
|
|
+ final Brain.MemoryValue<?> result = Brain.MemoryValue.createUnchecked(entry.getKey(), entry.getValue());
|
|
+
|
|
+ result.serialize(dynamicOps, recordBuilder);
|
|
+ }
|
|
}
|
|
+ // Leaf end - Remove stream in Brain
|
|
|
|
public boolean hasMemoryValue(MemoryModuleType<?> type) {
|
|
return this.checkMemory(type, MemoryStatus.VALUE_PRESENT);
|