88 lines
3.7 KiB
Diff
88 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: IPECTER <ipectert@gmail.com>
|
|
Date: Thu, 4 May 2023 16:54:53 +0900
|
|
Subject: [PATCH] Optimize VarInts
|
|
|
|
https://github.com/PaperMC/Paper/pull/8418
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
|
|
index c0bd2997fe3ebbfe926de832a36d209cc875f3e2..8bb552410207b39a3b4160a5df51410455107fcf 100644
|
|
--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
|
|
+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
|
|
@@ -99,12 +99,26 @@ public class FriendlyByteBuf extends ByteBuf {
|
|
private static final Gson GSON = new Gson();
|
|
|
|
public static boolean hasItemSerializeEvent = false; // Purpur
|
|
+ public static boolean optimizeVarInts = false; // Plazma
|
|
|
|
public FriendlyByteBuf(ByteBuf parent) {
|
|
this.source = parent;
|
|
}
|
|
|
|
+ // Plazma start - Optimize VarInts
|
|
+ private static final int[] VARINT_EXACT_BYTE_LENGTHS = new int[33];
|
|
+ static {
|
|
+ for (int i = 0; i <= 32; ++i) {
|
|
+ VARINT_EXACT_BYTE_LENGTHS[i] = (int) Math.ceil((31d - (i - 1)) / 7d);
|
|
+ }
|
|
+ VARINT_EXACT_BYTE_LENGTHS[32] = 1; // Special case for the number 0.
|
|
+ }
|
|
+ // Plazma end
|
|
public static int getVarIntSize(int value) {
|
|
+ // Plazma start - Optimize VarInts
|
|
+ if (optimizeVarInts)
|
|
+ return VARINT_EXACT_BYTE_LENGTHS[Integer.numberOfLeadingZeros(value)];
|
|
+ // Plazma end
|
|
for (int j = 1; j < 5; ++j) {
|
|
if ((value & -1 << j * 7) == 0) {
|
|
return j;
|
|
@@ -620,6 +634,25 @@ public class FriendlyByteBuf extends ByteBuf {
|
|
}
|
|
|
|
public FriendlyByteBuf writeVarInt(int value) {
|
|
+ // Plazma start - Optimize VarInts
|
|
+ if (optimizeVarInts) {
|
|
+ // Peel the one and two byte count cases explicitly as they are the most common VarInt sizes
|
|
+ // that the proxy will write, to improve inlining.
|
|
+ if ((value & (0xFFFFFFFF << 7)) == 0) {
|
|
+ writeByte(value);
|
|
+ } else if ((value & (0xFFFFFFFF << 14)) == 0) {
|
|
+ int w = (value & 0x7F | 0x80) << 8 | (value >>> 7);
|
|
+ writeShort(w);
|
|
+ } else {
|
|
+ while ((value & -128) != 0) {
|
|
+ this.writeByte(value & 127 | 128);
|
|
+ value >>>= 7;
|
|
+ }
|
|
+ this.writeByte(value);
|
|
+ }
|
|
+ return this;
|
|
+ }
|
|
+ // Plazma end
|
|
while ((value & -128) != 0) {
|
|
this.writeByte(value & 127 | 128);
|
|
value >>>= 7;
|
|
diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
|
|
index b2c9ac1947e6c9ad0e693cfeaf6f2f4bfd521aa0..525fe30b6abba295709fca3d10f9b24679112571 100644
|
|
--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
|
|
+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
|
|
@@ -38,11 +38,17 @@ public class GlobalConfiguration extends ConfigurationPart {
|
|
}
|
|
|
|
public Misc misc;
|
|
- public class Misc extends ConfigurationPart {
|
|
+ public class Misc extends ConfigurationPart.Post {
|
|
|
|
public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
|
|
public boolean doNotTriggerLootTableRefreshForNonPlayerInteraction = DO_OPTIMIZE;
|
|
public boolean doNotSendUselessEntityPackets = DO_OPTIMIZE;
|
|
+ public boolean optimizeVarInts = DO_OPTIMIZE;
|
|
+
|
|
+ @Override
|
|
+ public void postProcess() {
|
|
+ net.minecraft.network.FriendlyByteBuf.optimizeVarInts = optimizeVarInts;
|
|
+ }
|
|
|
|
}
|
|
|