Move patches around

2021-06-11 14:02:28 +02:00
parent 9f5325207d
commit 95d25d98e8
1079 changed files with 126318 additions and 0 deletions
--- a/patches/server-remapped/Optimize-RegistryID.c.patch
+++ b/patches/server-remapped/Optimize-RegistryID.c.patch
@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andrew Steinborn <git@steinborn.me>
+Date: Mon, 23 Jul 2018 13:08:19 -0400
+Subject: [PATCH] Optimize RegistryID.c()
+
+This is a frequent hotspot for world loading/saving.
+
+diff --git a/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
+++ b/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java
+@@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap<K> implements IdMap<K> {
+     private K[] byId;
+     private int nextId;
+     private int size;
+    private java.util.BitSet usedIds; // Paper
+ 
+     public CrudeIncrementalIntIdentityHashBiMap(int size) {
+         size = (int) ((float) size / 0.8F);
+         this.keys = (K[]) (new Object[size]); // Paper - decompile fix
+         this.values = new int[size];
+         this.byId = (K[]) (new Object[size]); // Paper - decompile fix
+        this.usedIds = new java.util.BitSet(); // Paper
+     }
+ 
+     // Paper start - decompile fix
+@@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap<K> implements IdMap<K> {
+     }
+ 
+     private int nextId() {
+-        while (this.nextId < this.byId.length && this.byId[this.nextId] != null) {
+-            ++this.nextId;
+        // Paper start
+        /*
+        while (this.e < this.d.length && this.d[this.e] != null) {
+            ++this.e;
+         }
+        */
+        this.nextId = this.usedIds.nextClearBit(0);
+        // Paper end
+ 
+         return this.nextId;
+     }
+@@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap<K> implements IdMap<K> {
+         this.byId = (K[]) (new Object[newSize]); // Paper - decompile fix
+         this.nextId = 0;
+         this.size = 0;
+        this.usedIds.clear(); // Paper
+ 
+         for (int j = 0; j < ak.length; ++j) {
+             if (ak[j] != null) {
+@@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap<K> implements IdMap<K> {
+         this.keys[k] = value;
+         this.values[k] = id;
+         this.byId[id] = value;
+        this.usedIds.set(id); // Paper
+         ++this.size;
+         if (id == this.nextId) {
+             ++this.nextId;
+@@ -0,0 +0,0 @@ public class CrudeIncrementalIntIdentityHashBiMap<K> implements IdMap<K> {
+         Arrays.fill(this.byId, (Object) null);
+         this.nextId = 0;
+         this.size = 0;
+        this.usedIds.clear(); // Paper
+     }
+ 
+     public int size() {