SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using ForgeFlower for Paper Only mc-dev imports

Browse Source 
ForgeFlower is better than Spigots FernFlower at decompiling the source.

However, in order to maintain the CraftBukkit patches, we must keep
using spigots for the primary.

However, for any file that we import on top of Spigots imported files
there is nothing stopping us from using better decompiled files.

So these changes will use ForgeFlower to maintain a better set of
decomped files, so anything we add on top of Paper can start off
in a better spot.
This commit is contained in:
Aikar
2018-08-31 18:56:57 -04:00
parent bd4da1aea0
commit e82ef9ec05
74 changed files with 987 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Spigot-Server-Patches/Optimize-RegistryMaterials.patch
View File

@@ -8,27 +8,18 @@ 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/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
index 2aa6f89c18..1974baff83 100644
index 83ce386e05..a47110bba8 100644
--- a/src/main/java/net/minecraft/server/RegistryMaterials.java
+++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
public class RegistryMaterials<V> implements IRegistry<V> {
public class RegistryMaterials<V> implements IRegistry<V> {
protected static final Logger a = LogManager.getLogger();
- protected final RegistryID<V> b = new RegistryID(256);
- protected final RegistryID<V> b = new RegistryID<V>(256);
- protected final BiMap<MinecraftKey, V> c = HashBiMap.create();
+ protected final RegistryID<V> b = new RegistryID<>(2048); // Paper - use bigger expected size to reduce collisions
+ protected final RegistryID<V> b = new RegistryID<V>(2048); // Paper - use bigger expected size to reduce collisions
+ protected final BiMap<MinecraftKey, V> c = HashBiMap.create(2048); // Paper - use bigger expected size to reduce collisions
protected Object[] d;
private int x;
@@ -0,0 +0,0 @@ public class RegistryMaterials<V> implements IRegistry<V> {
this.d = set.toArray(new Object[set.size()]);
}
- return this.d[random.nextInt(this.d.length)];
+ return (V) this.d[random.nextInt(this.d.length)]; // Paper - decompile fix
}
public boolean c(MinecraftKey minecraftkey) {
--