Try to optimize ClassInstanceMultiMap

patches/removed/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch

@@ -3,6 +3,8 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Wed, 30 Nov 2022 21:15:33 +0100
 Subject: [PATCH] Avoid Class#isAssignableFrom call in ClassInstanceMultiMap
 
+Removed since 1.21.1, replaced by VMP optimization
+
 License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 Gale - https://galemc.org
 
@@ -13,10 +15,10 @@ 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/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-index cd28174187133550e418c0e748ce8a06739d0146..99c90bc178975b87c8588998bd8d0b301ec79202 100644
+index 4264b3a69b5cbe2e56058927ceb5409389cecf4b..1cdff53d2c39d785b3b3306eef27649a4b092e52 100644
 --- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
 +++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-@@ -58,13 +58,33 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
+@@ -56,13 +56,33 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
      }
  
      public <S> Collection<S> find(Class<S> type) {

patches/server/0072-Replace-class-map-with-optimized-collection.patch

@@ -13,24 +13,15 @@ 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/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-index 038710ba934a9a57815dfe9f414b98223b848385..cd28174187133550e418c0e748ce8a06739d0146 100644
+index 038710ba934a9a57815dfe9f414b98223b848385..f1a288b6a29f3ba31e2364a9bc412c5e939b6ef7 100644
 --- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
 +++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-@@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableList;
+@@ -14,7 +14,7 @@ import java.util.Map.Entry;
- import com.google.common.collect.Iterators;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
-+import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
-+
- import java.util.AbstractCollection;
- import java.util.Collection;
- import java.util.Collections;
-@@ -14,7 +16,7 @@ import java.util.Map.Entry;
  import net.minecraft.Util;
  
  public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
 -    private final Map<Class<?>, List<T>> byClass = Maps.newHashMap();
-+    private final Map<Class<?>, List<T>> byClass = new Reference2ReferenceOpenHashMap<>(2); // Gale - Lithium - replace class map with optimized collection
++    private final Map<Class<?>, List<T>> byClass = new it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap<>(2); // Gale - Lithium - replace class map with optimized collection
      private final Class<T> baseClass;
      private final List<T> allInstances = Lists.newArrayList();
  

patches/server/0073-Replace-instance-list-with-optimized-collection.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
+Date: Sun, 18 Aug 2024 22:44:48 -0400
+Subject: [PATCH] Replace instance list with optimized collection
+
+License: MIT (https://opensource.org/licenses/MIT)
+Gale - https://galemc.org
+
+This patch is based on the following mixin:
+"com/ishland/vmp/mixins/general/collections/MixinTypeFilterableList.java"
+By: ishland <ishlandmc@yeah.net>
+As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
+Licensed under: MIT (https://opensource.org/licenses/MIT)
+
+diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
+index f1a288b6a29f3ba31e2364a9bc412c5e939b6ef7..4264b3a69b5cbe2e56058927ceb5409389cecf4b 100644
+--- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
++++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
+@@ -16,7 +16,7 @@ import net.minecraft.Util;
+ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
+     private final Map<Class<?>, List<T>> byClass = new it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap<>(2); // Gale - Lithium - replace class map with optimized collection
+     private final Class<T> baseClass;
+-    private final List<T> allInstances = Lists.newArrayList();
++    private final List<T> allInstances = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); // Gale - VMP - replace instance map with optimized collection
+ 
+     public ClassInstanceMultiMap(Class<T> elementType) {
+         this.baseClass = elementType;

patches/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch

@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Wed, 30 Nov 2022 21:15:33 +0100
+Subject: [PATCH] Avoid Class#isAssignableFrom call in ClassInstanceMultiMap
+
+License: MIT (https://opensource.org/licenses/MIT)
+Gale - https://galemc.org
+
+This patch is based on the following mixin:
+"com/ishland/vmp/mixins/general/collections/MixinTypeFilterableList.java"
+By: ishland <ishlandmc@yeah.net>
+As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
+Licensed under: MIT (https://opensource.org/licenses/MIT)
+
+diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
+index 4264b3a69b5cbe2e56058927ceb5409389cecf4b..ff545f6d36c265d70c79fc1acc7a279f10fbfcfd 100644
+--- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
++++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
+@@ -56,18 +56,41 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
+     }
+ 
+     public <S> Collection<S> find(Class<S> type) {
+-        if (!this.baseClass.isAssignableFrom(type)) {
+-            throw new IllegalArgumentException("Don't know how to search for " + type);
+-        } else {
+-            List<? extends T> list = this.byClass
+-                .computeIfAbsent(type, typeClass -> this.allInstances.stream().filter(typeClass::isInstance).collect(Util.toMutableList()));
+-            return (Collection<S>)Collections.unmodifiableCollection(list);
++        // Gale start - VMP - avoid Class#isAssignableFrom call in ClassInstanceMultiMap
++        /*
++        Only perform the slow Class#isAssignableFrom(Class) if a list doesn't exist for the type, otherwise
++        we can assume it's already valid. The slow-path code is moved to a separate method to help the JVM inline this.
++         */
++        Collection<T> collection = this.byClass.get(type);
++
++        if (collection == null) {
++            collection = this.createAllOfType(type);
+         }
++
++        return (Collection<S>) collection;
++    }
++
++    private <S> Collection<T> createAllOfType(Class<S> type) {
++        return this.byClass.computeIfAbsent(
++            type,
++            typeClass -> {
++                it.unimi.dsi.fastutil.objects.ObjectArrayList<T> ts = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(this.allInstances.size());
++
++                for (T _allElement : ((it.unimi.dsi.fastutil.objects.ObjectArrayList<T>) this.allInstances).elements()) {
++                    if (typeClass.isInstance(_allElement)) {
++                        ts.add(_allElement);
++                    }
++                }
++
++                return ts;
++            }
++        );
++        // Gale end - VMP - avoid Class#isAssignableFrom call in ClassInstanceMultiMap
+     }
+ 
+     @Override
+     public Iterator<T> iterator() {
+-        return (Iterator<T>)(this.allInstances.isEmpty() ? Collections.emptyIterator() : Iterators.unmodifiableIterator(this.allInstances.iterator()));
++        return this.allInstances.isEmpty() ? Collections.emptyIterator() : Iterators.unmodifiableIterator(this.allInstances.iterator());
+     }
+ 
+     public List<T> getAllInstances() {

patches/server/0105-Do-not-place-player-in-world-if-kicked-before-being-.patch

@@ -14,7 +14,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/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e7ccaf9d0f10f4c0fd24c4b5ca15972bfff67a0f..0f7a7d17a94c052111763bee00ba1b34442493d9 100644
+index 23121196950f9a8c2556b7b43bf5bab24b1b38f6..f86d2644024f4b190e9bded08aa9b71d6d0c8235 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -275,6 +275,13 @@ public abstract class PlayerList {

patches/server/0116-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 ca98310b745819e4dd56f226dcd0f9dfb35dab6e..804297a04988b3e21092a42df6584b7fc3cff1bb 100644
+index 51b1244b7a1f1beeac66a2763dced74798aa6d1b..70df666abd3264f24e2f3c6480c6310e4500fdf0 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 {