Add back Replace AI attributes with optimized collections

Co-Authored-By: QuanTrieuPCYT <admin@qtpc.tech>

patches/removed/server/0083-Replace-AI-attributes-with-optimized-collections.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Wed, 30 Nov 2022 20:54:31 +0100
-Subject: [PATCH] Replace AI attributes with optimized collections
-
-Removed since 1.20.5
-
-License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
-Gale - https://galemc.org
-
-This patch is based on the following mixin:
-"me/jellysquid/mods/lithium/mixin/collections/attributes/AttributeContainerMixin.java"
-By: 2No2Name <2No2Name@web.de>
-As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
-Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 58b82ac5b861ccb489f5586452ae020050be5ec8..0c804e597b08eb1fce53a1161aad3405b63c8058 100644
---- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-@@ -1,8 +1,6 @@
- package net.minecraft.world.entity.ai.attributes;
- 
--import com.google.common.collect.Maps;
- import com.google.common.collect.Multimap;
--import com.google.common.collect.Sets;
- import com.mojang.logging.LogUtils;
- import java.util.Collection;
- import java.util.Map;
-@@ -10,6 +8,9 @@ import java.util.Set;
- import java.util.UUID;
- import java.util.stream.Collectors;
- import javax.annotation.Nullable;
-+
-+import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
-+import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
- import net.minecraft.Util;
- import net.minecraft.core.Holder;
- import net.minecraft.core.registries.BuiltInRegistries;
-@@ -20,8 +21,10 @@ import org.slf4j.Logger;
- 
- public class AttributeMap {
-     private static final Logger LOGGER = LogUtils.getLogger();
--    private final Map<Attribute, AttributeInstance> attributes = Maps.newHashMap();
--    private final Set<AttributeInstance> dirtyAttributes = Sets.newHashSet();
-+    // Gale start - Lithium - replace AI attributes with optimized collections
-+    private final Map<Attribute, AttributeInstance> attributes = new Reference2ReferenceOpenHashMap<>(0);
-+    private final Set<AttributeInstance> dirtyAttributes = new ReferenceOpenHashSet<>(0);
-+    // Gale end - Lithium - replace AI attributes with optimized collections
-     private final AttributeSupplier supplier;
-     private final java.util.function.Function<Attribute, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations
- 

patches/server/0071-Replace-AI-attributes-with-optimized-collections.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Wed, 30 Nov 2022 20:54:31 +0100
+Subject: [PATCH] Replace AI attributes with optimized collections
+
+License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
+Gale - https://galemc.org
+
+This patch is based on the following mixin:
+"me/jellysquid/mods/lithium/mixin/collections/attributes/AttributeContainerMixin.java"
+By: 2No2Name <2No2Name@web.de>
+As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
+Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
+
+diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+index f9f6745d45aaba4a7106f80d403dcf9ae40e1d6c..f8174dd45cef1c521a96a7bbda811630c438cb4a 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
++++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+@@ -19,9 +19,11 @@ import org.slf4j.Logger;
+ 
+ public class AttributeMap {
+     private static final Logger LOGGER = LogUtils.getLogger();
+-    private final Map<Holder<Attribute>, AttributeInstance> attributes = new Object2ObjectOpenHashMap<>();
+-    private final Set<AttributeInstance> attributesToSync = new ObjectOpenHashSet<>();
+-    private final Set<AttributeInstance> attributesToUpdate = new ObjectOpenHashSet<>();
++    // Gale start - Lithium - replace AI attributes with optimized collections
++    private final Map<Holder<Attribute>, AttributeInstance> attributes = new it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap<>(0);
++    private final Set<AttributeInstance> attributesToSync = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(0);
++    private final Set<AttributeInstance> attributesToUpdate = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(0);
++    // Gale end - Lithium - replace AI attributes with optimized collections
+     private final AttributeSupplier supplier;
+     private final java.util.function.Function<Holder<Attribute>, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations
+ 

patches/server/0078-Check-frozen-ticks-before-landing-block.patch

@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0650254d7de55829c5d3c118ccf08ceec1cd08ac..f3540a3ade105d78952e9bf0c07ca05ef3f1bbc3 100644
+index 5bf7c9050df8beddd71ecb2fc14414f5e4016d79..875c4ef404b50ea11f19ccef652dfc74e8dea54d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -565,11 +565,10 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0099-Don-t-load-chunks-to-activate-climbing-entities.patch

@@ -28,7 +28,7 @@ index 537345d76f47ee8c14ce57577e7bb3146e48e963..517d6fe26a7bb5fb8ca9ecb39245492a
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f3540a3ade105d78952e9bf0c07ca05ef3f1bbc3..b28b20b228986abc933449896040f6956fe80f70 100644
+index 875c4ef404b50ea11f19ccef652dfc74e8dea54d..cc60840eff97877bbd4f9b7527642128651e58eb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2079,19 +2079,43 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0105-CraftBukkit-UUID-to-world-map.patch

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb1604ce8845c14eeb90641a074381b277ef918f..39f1a7e9125253783e952853347391ab2896b05d 100644
+index f1969c6b4f5f7bbd75ae69e2c7f62d086429e320..0ef77faaa91e6041e6c7ef6168901e9756a4900b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,6 +41,9 @@ import java.util.logging.Logger;

patches/server/0107-Specific-interval-TPS-API.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 39f1a7e9125253783e952853347391ab2896b05d..e78b8577818b63b198dda79b8645b995fa8f1261 100644
+index 0ef77faaa91e6041e6c7ef6168901e9756a4900b..08a5c4df85714619e19bff8ae26fe0ea5b58255b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -3043,6 +3043,24 @@ public final class CraftServer implements Server {

patches/server/0108-5-second-TPS-average.patch

@@ -79,7 +79,7 @@ index 2d25db0793acbdd1c95c0c6c0d7b50109d604bfe..79e2cd6e47e037aaec68afa3fa8544fe
                      tps5.add(currentTps, diff);
                      tps15.add(currentTps, diff);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e78b8577818b63b198dda79b8645b995fa8f1261..76a076e50c9860a6e648fcf51e9520f7e752d16c 100644
+index 08a5c4df85714619e19bff8ae26fe0ea5b58255b..305902217edba06a3369e54d31631afe815c20c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -3043,8 +3043,27 @@ public final class CraftServer implements Server {

patches/server/0110-Last-tick-time-API.patch

@@ -23,7 +23,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 76a076e50c9860a6e648fcf51e9520f7e752d16c..87023666f2e6dbfa431a50f612fa1b2c16f5e000 100644
+index 305902217edba06a3369e54d31631afe815c20c8..22c76d7301037617ff56da3aedd07a0b36aab290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -3272,4 +3272,22 @@ public final class CraftServer implements Server {

patches/server/0115-Optimize-matching-item-checks.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 96427414e5af8663587a70608d66cf98516cf224..fd939864da9f79c56c8cbfa3c521e2d12e6e33cd 100644
+index ca98310b745819e4dd56f226dcd0f9dfb35dab6e..804297a04988b3e21092a42df6584b7fc3cff1bb 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -851,7 +851,7 @@ public final class ItemStack implements DataComponentHolder {

patches/server/0118-Reduce-RandomSource-instances.patch

@@ -96,7 +96,7 @@ index 5c0e5803284bfc82c2dd8bba9ded0ba7aac4962a..2cc37e5734233954710c4ef55bf3b291
          this.level = world;
          this.id = nbt.getInt("Id");
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b2f4686d4eb56bd134817419bf326d84675e0c2d..0c9c75e3c094e22aad926977545d2ae7075e33ad 100644
+index 977640aa7f07da5b5e002bd98ae936760d40caf0..e895eb8049268560031e8483635668aa3f83dbe0 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -335,7 +335,7 @@ public class Explosion {

patches/server/0119-Add-xor-shift-random.patch

@@ -40,7 +40,7 @@ index fea92d280c6817cee1f18379d5ed51a3a22ee344..fd5d7feb9670a14cc6f7daa8ce6ba6a2
      private long lastFill = -1;
      private long nextRefill = -1;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index f23ed06a943646f45e1291f35ab3025e1dfa6b49..83ba2e128fb72f786675d1eea709be3e3a319e80 100644
+index 67103310c59bcf7bd6e873d97a4c88a032d9f999..4aa33233060b2b2bd809d92d35bd0933cb015d41 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -129,7 +129,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p

patches/server/0120-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch

@@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai
 delete the line of sight cache less often and use a faster nearby comparison
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b28b20b228986abc933449896040f6956fe80f70..da8c5d45f50091946309afa4130f410e40c69a50 100644
+index cc60840eff97877bbd4f9b7527642128651e58eb..8191eda135b71d0515c918e88b35aaeec21c59de 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1030,10 +1030,9 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0122-Reduce-line-of-sight-updates-and-cache-lookups.patch

@@ -115,7 +115,7 @@ index 57472cb54e9fd83e980e3c57f28d6e6643f422e8..ce50852a9b18679a80e9393e8d904935
              return bl;
          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index b8924f132607ecce6104343f6ecec004c1b78461..f3de24c2bb3303bde231fe64e9b75177ede26df8 100644
+index c57ebf0f37aba2d118e54f3c71697f29bb9a57a0..417dda8dc61af144fe07963b66080e5c9f2750b4 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -34,6 +34,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {