From 6577db6dd63cddaa06aa8041c6dc45ab704fe9e6 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 6 Dec 2023 22:41:13 -0800
Subject: [PATCH] cleanup Optimize MappedRegistry patch

---
 .../server/0244-Optimize-MappedRegistry.patch  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/patches/server/0244-Optimize-MappedRegistry.patch b/patches/server/0244-Optimize-MappedRegistry.patch
index 560ac28d65..ae3bc03120 100644
--- a/patches/server/0244-Optimize-MappedRegistry.patch
+++ b/patches/server/0244-Optimize-MappedRegistry.patch
@@ -8,21 +8,21 @@ Use larger initial sizes to increase bucket capacity on the BiMap
 BiMap.get was seen to be using a good bit of CPU time.
 
 diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java
-index 33990e4f9b5e7e3d8080c80f639b81b7f798c859..6ef235aa9ea8ea2baec335f99f8368dbfc55a10e 100644
+index 33990e4f9b5e7e3d8080c80f639b81b7f798c859..742af4feb3986ca7d8f5ed136b556a41cbe0722f 100644
 --- a/src/main/java/net/minecraft/core/MappedRegistry.java
 +++ b/src/main/java/net/minecraft/core/MappedRegistry.java
-@@ -35,13 +35,11 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
+@@ -35,13 +35,13 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
      private static final Logger LOGGER = LogUtils.getLogger();
      final ResourceKey<? extends Registry<T>> key;
      private final ObjectList<Holder.Reference<T>> byId = new ObjectArrayList<>(256);
 -    private final Reference2IntMap<T> toId = Util.make(new Reference2IntOpenHashMap<>(), (map) -> {
--        map.defaultReturnValue(-1);
--    });
++    private final Reference2IntMap<T> toId = Util.make(new Reference2IntOpenHashMap<>(2048), (map) -> { // Paper - use bigger expected size to reduce collisions
+         map.defaultReturnValue(-1);
+     });
 -    private final Map<ResourceLocation, Holder.Reference<T>> byLocation = new HashMap<>();
 -    private final Map<ResourceKey<T>, Holder.Reference<T>> byKey = new HashMap<>();
 -    private final Map<T, Holder.Reference<T>> byValue = new IdentityHashMap<>();
 -    private final Map<T, Lifecycle> lifecycles = new IdentityHashMap<>();
-+    private final Reference2IntMap<T> toId = new Reference2IntOpenHashMap<T>(2048);// Paper - use bigger expected size to reduce collisions and direct intent for FastUtil to be identity map
 +    private final Map<ResourceLocation, Holder.Reference<T>> byLocation = new HashMap<>(2048); // Paper - use bigger expected size to reduce collisions
 +    private final Map<ResourceKey<T>, Holder.Reference<T>> byKey = new HashMap<>(2048); // Paper - use bigger expected size to reduce collisions
 +    private final Map<T, Holder.Reference<T>> byValue = new IdentityHashMap<>(2048); // Paper - use bigger expected size to reduce collisions
@@ -30,11 +30,3 @@ index 33990e4f9b5e7e3d8080c80f639b81b7f798c859..6ef235aa9ea8ea2baec335f99f8368db
      private Lifecycle registryLifecycle;
      private volatile Map<TagKey<T>, HolderSet.Named<T>> tags = new IdentityHashMap<>();
      private boolean frozen;
-@@ -87,6 +85,7 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
-     }
- 
-     public MappedRegistry(ResourceKey<? extends Registry<T>> key, Lifecycle lifecycle, boolean intrusive) {
-+        this.toId.defaultReturnValue(-1); // Paper
-         this.key = key;
-         this.registryLifecycle = lifecycle;
-         if (intrusive) {