mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
387597f347
Upstream has released updates that appear to apply and compile correctly Leaves Changes: LeavesMC/Leaves@88819fe8 Add mc-old hopper suck-in behavior (#395) LeavesMC/Leaves@7394e8dd Fix papermc repo LeavesMC/Leaves@85c7bf11 Remove cache-world-generator-sea-level (#392) LeavesMC/Leaves@00798036 init 1.21.4, and boom! LeavesMC/Leaves@91fc24da build change, but weight not work LeavesMC/Leaves@4ccdf459 just work LeavesMC/Leaves@05ee2e36 Build changes, and delete timings LeavesMC/Leaves@fcc859dc Fix API patches (#406) LeavesMC/Leaves@6a1259df 0006/0129 LeavesMC/Leaves@3e3b05df 0009/0129 LeavesMC/Leaves@c3255c4f 0011/0129 LeavesMC/Leaves@6284c7b6 0018/0129 LeavesMC/Leaves@7abdc88c 0030/0129 LeavesMC/Leaves@4d119ff9 0035/0129 LeavesMC/Leaves@60baed99 0043/0129 LeavesMC/Leaves@dc319d5b 0048/0129 LeavesMC/Leaves@73a505d5 0049/0129 LeavesMC/Leaves@016b29dd 0057/0129 LeavesMC/Leaves@c9cf5af8 0065/0129 LeavesMC/Leaves@330b79ff 0086/0129 (#408) LeavesMC/Leaves@06c1d946 0087/0129 LeavesMC/Leaves@bf4bc284 0091/0129 LeavesMC/Leaves@102a3b70 0097/0129 LeavesMC/Leaves@53b43fed 0101/0129 LeavesMC/Leaves@892f3925 102/129 LeavesMC/Leaves@08c3043a 0107/0129 LeavesMC/Leaves@48764d8e 0112/0129 LeavesMC/Leaves@8380feff 0118/0129 LeavesMC/Leaves@e51603db 0129/0129, 100% patched LeavesMC/Leaves@ef851152 fix some LeavesMC/Leaves@9b7c6e88 server work LeavesMC/Leaves@272b7dcb Protocol... (#409) LeavesMC/Leaves@7be1bc97 Make jade better LeavesMC/Leaves@5350f6ea Make action work LeavesMC/Leaves@f07c26c8 fix action jar
66 lines
3.4 KiB
Diff
66 lines
3.4 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/net/minecraft/world/entity/ai/Brain.java b/net/minecraft/world/entity/ai/Brain.java
|
|
index 450396468b23fd90cb8036dbbdd0927051f907af..083eb9a7a0bc14d30db944f356d98ca552fa1784 100644
|
|
--- a/net/minecraft/world/entity/ai/Brain.java
|
|
+++ b/net/minecraft/world/entity/ai/Brain.java
|
|
@@ -70,13 +70,22 @@ public class Brain<E extends LivingEntity> {
|
|
(new MapCodec<Brain<E>>() {
|
|
@Override
|
|
public <T> Stream<T> keys(DynamicOps<T> ops) {
|
|
- return memoryTypes.stream()
|
|
- .flatMap(
|
|
- memoryModuleType -> memoryModuleType.getCodec()
|
|
- .map(codec -> BuiltInRegistries.MEMORY_MODULE_TYPE.getKey((MemoryModuleType<?>)memoryModuleType))
|
|
- .stream()
|
|
- )
|
|
- .map(resourceLocation -> ops.createString(resourceLocation.toString()));
|
|
+ // Leaf start - Remove stream in Brain
|
|
+ List<T> results = new java.util.ArrayList<>();
|
|
+
|
|
+ for (MemoryModuleType<?> memoryModuleType : memoryTypes) {
|
|
+ final Optional<?> codec = memoryModuleType.getCodec();
|
|
+
|
|
+ if (codec.isPresent()) {
|
|
+ final net.minecraft.resources.ResourceLocation resourceLocation = BuiltInRegistries.MEMORY_MODULE_TYPE.getKey(memoryModuleType);
|
|
+ final T opsResult = ops.createString(resourceLocation.toString());
|
|
+
|
|
+ results.add(opsResult);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return results.stream();
|
|
+ // Leaf end - Remove stream in Brain
|
|
}
|
|
|
|
@Override
|
|
@@ -111,7 +120,14 @@ public class Brain<E extends LivingEntity> {
|
|
|
|
@Override
|
|
public <T> RecordBuilder<T> encode(Brain<E> input, DynamicOps<T> ops, RecordBuilder<T> prefix) {
|
|
- input.memories().forEach(memoryValue -> memoryValue.serialize(ops, prefix));
|
|
+ // Leaf start - Remove stream in Brain
|
|
+ for (Entry<MemoryModuleType<?>, Optional<? extends ExpirableValue<?>>> memory : input.memories.entrySet()) {
|
|
+ final Brain.MemoryValue<?> result = Brain.MemoryValue.createUnchecked(memory.getKey(), memory.getValue());
|
|
+
|
|
+ result.serialize(ops, prefix);
|
|
+ }
|
|
+ // Leaf end - Remove stream in Brain
|
|
+
|
|
return prefix;
|
|
}
|
|
})
|
|
@@ -153,7 +169,7 @@ public class Brain<E extends LivingEntity> {
|
|
}
|
|
|
|
Stream<Brain.MemoryValue<?>> memories() {
|
|
- return this.memories.entrySet().stream().map(memory -> Brain.MemoryValue.createUnchecked(memory.getKey(), memory.getValue()));
|
|
+ return this.memories.entrySet().stream().map(memory -> Brain.MemoryValue.createUnchecked(memory.getKey(), memory.getValue())); // Leaf - Remove stream in Brain - diff on change
|
|
}
|
|
|
|
public boolean hasMemoryValue(MemoryModuleType<?> type) {
|