mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-26 10:29:13 +00:00
* Init 1.21.6
* Finish API patches
* Apply purpur patches & all paper server patches
* Apply some
* Apply all
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@6aafe29e 1.21.6 dev
PaperMC/Paper@ae7c74ec tweak mob goal keys, generate missing api
PaperMC/Paper@9ea1460b Revert "fix sponge-absorb deleting chest content (#12647)"
Purpur Changes:
PurpurMC/Purpur@eb0ba67d Updated Upstream (Paper)
PurpurMC/Purpur@7c6502dc Updated Upstream (Paper)
PurpurMC/Purpur@aa289e2c Updated Upstream (Paper)
PurpurMC/Purpur@b1d412fb Updated Upstream (Paper)
PurpurMC/Purpur@293e28a0 use empty registryaccess where context is not needed, closes #1676
PurpurMC/Purpur@452bb319 port PaperMC/Paper#12654, closes #1665
PurpurMC/Purpur@849bc79c register test subcommands used for debugging, closes #1675
* Fix build & diff
* Update vanilla attribute size
* [ci/skip] Forget to remove this
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a24f9b20 1.21.6 dev
PaperMC/Paper@457a0a69 Bump version string and protocol version to 1.21.6 release
PaperMC/Paper@245b5473 Update base to 1.21.6
PaperMC/Paper@b28d77b3 Update Moonrise to 1.21.6
PaperMC/Paper@8318dcb7 Update DataConverter to 1.21.6-rc1
Purpur Changes:
PurpurMC/Purpur@b228e316 Updated Upstream (Paper)
PurpurMC/Purpur@d6562a57 make happy ghast takes-damage-from-water and always-drop-exp options work
PurpurMC/Purpur@08d989b6 inline import
PurpurMC/Purpur@61d7f559 Updated Upstream (Paper)
PurpurMC/Purpur@469a4de5 Merge branch 'ver/1.21.5' into ver/1.21.6
* Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@d2b1158e Set correct world access on BSL snapshots
* Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@023e6c29 Ensure waypoints are per world
PaperMC/Paper@40d5d31c Fix recursively converting JSON Text Components
* Update spigot mapping to remap reobf mapping to mojamp for plugins
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@1fcc4162 Implement FeatureHooks#isChunkSent for Moonrise chunk system
PaperMC/Paper@e4d7178a Implement WaypointTransmitter#isChunkVisible
PaperMC/Paper@8980ead7 Directly walk text component after converting from JSON
PaperMC/Paper@5613ed6d Provide env environment variable and copy spigots sys prop for overriding default repository
PaperMC/Paper@62b7f86d Avoid and discourage use of Maven Central as a CDN (#12689)
PaperMC/Paper@f5534cb7 [ci/skip] Run generators (#12691)
PaperMC/Paper@4781d28b Re-add Log4j Javadocs (#12693)
PaperMC/Paper@74fbcce5 Check type of Material in get/set stats (#12607)
PaperMC/Paper@4b3f967e Improve Fix MC-44654 (#12703)
PaperMC/Paper@a7dd2635 Enable spigot obfuscation support (#12695)
PaperMC/Paper@6a51c44e Cleanup Primed TNT Fix (#12704)
PaperMC/Paper@839c6a18 Fix #11169 (#12706)
PaperMC/Paper@c77d5f99 Fix MC-297591
PaperMC/Paper@219f86ee Implement chunk unload delay config option
PaperMC/Paper@e4eb69b8 Do not allow ticket level decreases to be processed asynchronously
PaperMC/Paper@71b0c768 Adds support for vanilla negative explosions (#12705)
PaperMC/Paper@3750927a [ci/skip] Fix PermissionManager#clearPermissions() docs bad wording (#12657)
PaperMC/Paper@d61a51e8 Add ItemType#getBurnDuration() (#12604)
PaperMC/Paper@29fc8532 Allow empty paths in namespaced keys (#12687)
PaperMC/Paper@4419afb9 fix: Safely handle nanosecond overflow in ClickCallback (#12686)
PaperMC/Paper@56528821 Add `isProxyEnabled` method to ServerConfiguration (#12664)
PaperMC/Paper@c0dda0ea Add `isForceDefaultGameMode` method (#12673)
PaperMC/Paper@e714de63 Fix excess slot updates
PaperMC/Paper@6d0821d2 [ci/skip] Fix docs for Spawner class and cleanup (#12710)
PaperMC/Paper@cceffe3d Release ItemType and BlockType (#12708)
PaperMC/Paper@186e9e33 Relocate CommandMap#registerServerAliases() call to after lifecycle events have been run (#12601)
PaperMC/Paper@5edcf6dd Cleanup/command dispatching (#12713)
Purpur Changes:
PurpurMC/Purpur@baa196f5 Updated Upstream (Paper)
PurpurMC/Purpur@fdd1e980 Updated Upstream (Paper)
PurpurMC/Purpur@439f15db Updated Upstream (Paper)
PurpurMC/Purpur@46a28b93 [ci/skip] update version in README
PurpurMC/Purpur@162bd288 Updated Upstream (Paper)
PurpurMC/Purpur@afcdf9bb Updated Upstream (Paper)
* fix random tick order
Signed-off-by: hayanesuru <hayanesuru@outlook.jp>
* update optimize random tick
* fix mob spawning over limit
* optimize mob spawning
* fix FastBitRadixSort memory leak
* optimize brain collections
* [ci/skip] update comments
* Revert "fix FastBitRadixSort memory leak"
This reverts commit bdea683525.
* optimize brain collections
* fix async mob spawning data race
* [ci/skip] cleanup
* remove hash lookup in optimize random tick
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@803baf0b Support hidden entities in Waypoints (#12715)
PaperMC/Paper@1814d8b4 build: publish to fill (#12717)
PaperMC/Paper@e454fef4 Add support for private constructors in plugin main classes (#12652)
PaperMC/Paper@d0e808f4 Move player to correct position in vehicle move packet handler
PaperMC/Paper@46b4b0b8 Improve keepalive ping system
PaperMC/Paper@38c1ddb5 Add and use FeatureHooks.getAllEntities
PaperMC/Paper@2f083acb Ensure player entity schedulers are ticked when they are dead
PaperMC/Paper@7c90c7c4 Optimise EntityScheduler ticking
PaperMC/Paper@aa6ee44a Re-add global region scheduler tick erroneously removed in last commit
PaperMC/Paper@d7510efc Fix #12722 (#12726)
PaperMC/Paper@0caf75f8 Fix #12721 (#12725)
PaperMC/Paper@bee28792 Adventure 4.23.0 (#12690)
PaperMC/Paper@692e93a9 Fix MC-299110
PaperMC/Paper@ea10fa4a Don't mutate the position of Items for MC-4 Fix (#12702)
PaperMC/Paper@aa6cd74c Remove unnecesary item check for ServerboundPlayerActionPacket RELEASE_USE_ITEM (#12668)
PaperMC/Paper@c9e89f49 Expose arrow velocity in EntityShootBowEvent for mobs (#12688)
PaperMC/Paper@7ec3174a Jump out of experimental phase
PaperMC/Paper@4e1a2555 Update try catch for command handling
PaperMC/Paper@e382e687 Fix 0 yield on explosion events
PaperMC/Paper@35b2c6ec Use dropped item for stats info (#12747)
PaperMC/Paper@bd79e20c [ci/skip] PluginManager#getPlugin and PluginManager#isPluginEnabled are case-insensitive (#12723)
Purpur Changes:
PurpurMC/Purpur@4a5974cf Updated Upstream (Paper)
PurpurMC/Purpur@3893bba0 this is important...
PurpurMC/Purpur@47e758fb Updated Upstream (Paper)
* Update PWT patch
* cleanup
* fix playermobcaps command
* fix Didn't fill chunk buffer in async chunk sending
* cleanup
* fix HurtByTargetGoal npe
* optimize collectSpawningChunks (#382)
* optimize collectSpawningChunks
* add bit set
* cleanup
* cleanup
* cleanup
* cleanup
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@57c202e0 Allow adventure nbt codec to parse all tags
Purpur Changes:
PurpurMC/Purpur@a4776d7b Updated Upstream (Paper)
PurpurMC/Purpur@dfd8a7ad Fix phantom going at high speed when ridden (#1680)
* Fix diff
---------
Signed-off-by: hayanesuru <hayanesuru@outlook.jp>
Co-authored-by: hayanesuru <hayanesuru@outlook.jp>
178 lines
7.7 KiB
Diff
178 lines
7.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Fri, 21 Feb 2025 18:05:09 +0100
|
|
Subject: [PATCH] Optimize LinearPalette
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
getSerializedSize is 76% faster: 70.3ns → 17.2ns
|
|
getSerializedSize.write is 13-21% faster: 659.5ns → 523.1ns
|
|
|
|
diff --git a/net/minecraft/world/level/chunk/LinearPalette.java b/net/minecraft/world/level/chunk/LinearPalette.java
|
|
index 2073f6ff41aa570102621d183ee890b076267d54..2595ab14e2edd9c0f113f8997b0d3290a2c2fcad 100644
|
|
--- a/net/minecraft/world/level/chunk/LinearPalette.java
|
|
+++ b/net/minecraft/world/level/chunk/LinearPalette.java
|
|
@@ -10,6 +10,10 @@ import org.apache.commons.lang3.Validate;
|
|
public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.patches.fast_palette.FastPalette<T> { // Paper - optimise palette reads
|
|
private final IdMap<T> registry;
|
|
private final T[] values;
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ private final int[] byteSizes;
|
|
+ private final int[] idCache; // Cached registry IDs for values
|
|
+ // Leaf end - Optimize LinearPalette
|
|
private final PaletteResize<T> resizeHandler;
|
|
private final int bits;
|
|
private int size;
|
|
@@ -24,23 +28,40 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
private LinearPalette(IdMap<T> registry, int bits, PaletteResize<T> resizeHandler, List<T> values) {
|
|
this.registry = registry;
|
|
this.values = (T[])(new Object[1 << bits]);
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ this.idCache = new int[1 << bits];
|
|
+ this.byteSizes = new int[1 << bits]; // Initialize byteSizes
|
|
+ // Leaf end - Optimize LinearPalette
|
|
this.bits = bits;
|
|
this.resizeHandler = resizeHandler;
|
|
Validate.isTrue(values.size() <= this.values.length, "Can't initialize LinearPalette of size %d with %d entries", this.values.length, values.size());
|
|
|
|
for (int i = 0; i < values.size(); i++) {
|
|
- this.values[i] = values.get(i);
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ T value = values.get(i);
|
|
+ this.values[i] = value;
|
|
+ int id = registry.getId(value);
|
|
+ this.idCache[i] = id;
|
|
+ this.byteSizes[i] = VarInt.getByteSize(id); // Precompute byte size
|
|
+ // Leaf end - Optimize LinearPalette
|
|
}
|
|
|
|
this.size = values.size();
|
|
}
|
|
|
|
- private LinearPalette(IdMap<T> registry, T[] values, PaletteResize<T> resizeHandler, int bits, int size) {
|
|
+ private LinearPalette(IdMap<T> registry, T[] values, int[] idCache, PaletteResize<T> resizeHandler, int bits, int size) { // Leaf - Optimize LinearPalette
|
|
this.registry = registry;
|
|
this.values = values;
|
|
+ this.idCache = idCache; // Leaf - Optimize LinearPalette
|
|
this.resizeHandler = resizeHandler;
|
|
this.bits = bits;
|
|
this.size = size;
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ this.byteSizes = new int[idCache.length];
|
|
+ for (int i = 0; i < idCache.length; i++) {
|
|
+ this.byteSizes[i] = VarInt.getByteSize(idCache[i]);
|
|
+ }
|
|
+ // Leaf end - Optimize LinearPalette
|
|
}
|
|
|
|
public static <A> Palette<A> create(int bits, IdMap<A> registry, PaletteResize<A> resizeHandler, List<A> values) {
|
|
@@ -58,6 +79,11 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
int ix = this.size;
|
|
if (ix < this.values.length) {
|
|
this.values[ix] = state;
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ int id = registry.getId(state);
|
|
+ this.idCache[ix] = id;
|
|
+ this.byteSizes[ix] = VarInt.getByteSize(id); // Cache byte size
|
|
+ // Leaf end - Optimize LinearPalette
|
|
this.size++;
|
|
return ix;
|
|
} else {
|
|
@@ -90,7 +116,12 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
this.size = buffer.readVarInt();
|
|
|
|
for (int i = 0; i < this.size; i++) {
|
|
- this.values[i] = this.registry.byIdOrThrow(buffer.readVarInt());
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ int id = buffer.readVarInt();
|
|
+ this.values[i] = this.registry.byIdOrThrow(id);
|
|
+ this.idCache[i] = id;
|
|
+ this.byteSizes[i] = VarInt.getByteSize(id); // Precompute during read
|
|
+ // Leaf end - Optimize LinearPalette
|
|
}
|
|
}
|
|
|
|
@@ -99,17 +130,18 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
buffer.writeVarInt(this.size);
|
|
|
|
for (int i = 0; i < this.size; i++) {
|
|
- buffer.writeVarInt(this.registry.getId(this.values[i]));
|
|
+ buffer.writeVarInt(this.idCache[i]); // Leaf - Optimize LinearPalette - Use cached ID
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public int getSerializedSize() {
|
|
- int byteSize = VarInt.getByteSize(this.getSize());
|
|
-
|
|
- for (int i = 0; i < this.getSize(); i++) {
|
|
- byteSize += VarInt.getByteSize(this.registry.getId(this.values[i]));
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ int byteSize = VarInt.getByteSize(this.size);
|
|
+ for (int i = 0; i < this.size; i++) {
|
|
+ byteSize += this.byteSizes[i]; // Use cached byte sizes
|
|
}
|
|
+ // Leaf end - Optimize LinearPalette
|
|
|
|
return byteSize;
|
|
}
|
|
@@ -121,6 +153,56 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
|
|
@Override
|
|
public Palette<T> copy(PaletteResize<T> resizeHandler) {
|
|
- return new LinearPalette<>(this.registry, (T[])((Object[])this.values.clone()), resizeHandler, this.bits, this.size);
|
|
+ // Leaf start - Optimize LinearPalette
|
|
+ // Special case for empty palette - fastest possible return
|
|
+ if (this.size == 0) {
|
|
+ return new LinearPalette<>(this.registry, (T[]) new Object[1], new int[1], resizeHandler, this.bits, 0);
|
|
+ }
|
|
+
|
|
+ // For small sizes, allocate exact-sized arrays and use direct assignment
|
|
+ if (this.size <= 4) {
|
|
+ @SuppressWarnings("unchecked")
|
|
+ T[] valuesCopy = (T[]) new Object[this.size];
|
|
+ int[] idCacheCopy = new int[this.size];
|
|
+
|
|
+ // Unrolled loop eliminates loop overhead for small arrays
|
|
+ switch (this.size) {
|
|
+ case 4:
|
|
+ valuesCopy[3] = this.values[3];
|
|
+ idCacheCopy[3] = this.idCache[3];
|
|
+ // Fall through
|
|
+ case 3:
|
|
+ valuesCopy[2] = this.values[2];
|
|
+ idCacheCopy[2] = this.idCache[2];
|
|
+ // Fall through
|
|
+ case 2:
|
|
+ valuesCopy[1] = this.values[1];
|
|
+ idCacheCopy[1] = this.idCache[1];
|
|
+ // Fall through
|
|
+ case 1:
|
|
+ valuesCopy[0] = this.values[0];
|
|
+ idCacheCopy[0] = this.idCache[0];
|
|
+ }
|
|
+
|
|
+ return new LinearPalette<>(this.registry, valuesCopy, idCacheCopy, resizeHandler, this.bits, this.size);
|
|
+ }
|
|
+
|
|
+ // For larger arrays, use optimized bulk operations
|
|
+ @SuppressWarnings("unchecked")
|
|
+ T[] valuesCopy = (T[]) new Object[this.size];
|
|
+ int[] idCacheCopy = new int[this.size];
|
|
+
|
|
+ System.arraycopy(this.values, 0, valuesCopy, 0, this.size);
|
|
+ System.arraycopy(this.idCache, 0, idCacheCopy, 0, this.size);
|
|
+
|
|
+ return new LinearPalette<>(
|
|
+ this.registry,
|
|
+ valuesCopy,
|
|
+ idCacheCopy,
|
|
+ resizeHandler,
|
|
+ this.bits,
|
|
+ this.size
|
|
+ );
|
|
+ // Leaf end - Optimize LinearPalette
|
|
}
|
|
}
|