mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-23 08:49:18 +00:00
d9c4e8a199
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@efc76215 Add missing copper blocks to waxables and weatherables options (#1712) PurpurMC/Purpur@3ca0d663 Updated Upstream (Paper) PurpurMC/Purpur@917675d0 Updated Upstream (Paper) PurpurMC/Purpur@ffe2f809 Add option to disable Warden Sonic Boom (#1713)
66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Mon, 7 Jul 2025 04:21:38 +0300
|
|
Subject: [PATCH] Small optimization to LinearPalette
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/chunk/LinearPalette.java b/net/minecraft/world/level/chunk/LinearPalette.java
|
|
index c93302f2457c71caae6f56c59d3a66357a0a6cd6..d37624464962f534ea6fe8672ad2157a40d2111c 100644
|
|
--- a/net/minecraft/world/level/chunk/LinearPalette.java
|
|
+++ b/net/minecraft/world/level/chunk/LinearPalette.java
|
|
@@ -10,7 +10,7 @@ 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 T[] values;
|
|
private final int bits;
|
|
- private int size;
|
|
+ private volatile int size; // DivineMC - Small optimization to LinearPalette
|
|
|
|
// Paper start - optimise palette reads
|
|
@Override
|
|
@@ -43,11 +43,16 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
|
|
@Override
|
|
public int idFor(T state, PaletteResize<T> resizeHandler) {
|
|
- for (int i = 0; i < this.size; i++) {
|
|
- if (this.values[i] == state) {
|
|
+ // DivineMC start - Small optimization to LinearPalette
|
|
+ final T[] values = this.values;
|
|
+ final int currentSize = this.size;
|
|
+
|
|
+ for (int i = 0; i < currentSize; i++) {
|
|
+ if (values[i] == state) {
|
|
return i;
|
|
}
|
|
}
|
|
+ // DivineMC end - Small optimization to LinearPalette
|
|
|
|
int ix = this.size;
|
|
if (ix < this.values.length) {
|
|
@@ -61,17 +66,23 @@ public class LinearPalette<T> implements Palette<T>, ca.spottedleaf.moonrise.pat
|
|
|
|
@Override
|
|
public boolean maybeHas(Predicate<T> filter) {
|
|
- for (int i = 0; i < this.size; i++) {
|
|
- if (filter.test(this.values[i])) {
|
|
+ // DivineMC start - Small optimization to LinearPalette
|
|
+ final T[] values = this.values;
|
|
+ final int currentSize = this.size;
|
|
+
|
|
+ for (int i = 0; i < currentSize; i++) {
|
|
+ T value = values[i];
|
|
+ if (value != null && filter.test(value)) {
|
|
return true;
|
|
}
|
|
}
|
|
+ // DivineMC end - Small optimization to LinearPalette
|
|
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
- public T valueFor(int id) {
|
|
+ public synchronized T valueFor(int id) { // DivineMC - Small optimization to LinearPalette
|
|
if (id >= 0 && id < this.size) {
|
|
return this.values[id];
|
|
} else {
|