Updated Upstream (Luminol)

Upstream has released updates that appear to apply and compile correctly Luminol Changes: LuminolMC/Luminol@fefc53d Only run discard checks of projectile chunk-loading optimization on tick regions LuminolMC/Luminol@aa49ca6 Check null LuminolMC/Luminol@0a0cdb8 Added some optimizations
404Setup · Jul 29, 2024 · 090bc52 · 090bc52
1 parent c6f891e
commit 090bc52
Show file tree

Hide file tree

Showing 25 changed files with 6 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group = one.tranic.levelpowered.bukkit
 version = 1.20.6-R0.1-SNAPSHOT
 
-luminolCommit = 0e049306c9a0b825f7d6181db4ade172d3e08ec1
+luminolCommit = 0a0cdb8d54f0cb6991a1f7fa36126325e97a657a
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/...concurrency-issues-when-using-image.patch → ...concurrency-issues-when-using-image.patch b/...concurrency-issues-when-using-image.patch → ...concurrency-issues-when-using-image.patch
diff --git a/...-dirty-stats-copy-when-requesting-p.patch → ...-dirty-stats-copy-when-requesting-p.patch b/...-dirty-stats-copy-when-requesting-p.patch → ...-dirty-stats-copy-when-requesting-p.patch
diff --git a/...e-coordinate-key-used-for-nearby-pl.patch → ...e-coordinate-key-used-for-nearby-pl.patch b/...e-coordinate-key-used-for-nearby-pl.patch → ...e-coordinate-key-used-for-nearby-pl.patch
@@ -30,7 +30,7 @@ index f164256d59b761264876ca0c85f812d101bfd5de..10465a33d90a1e43b9dbd7764c895dd3
          final TrackedChunk chunk = this.byChunk.get(CoordinateUtils.getChunkKey(chunkX, chunkZ));
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 1cb09933aa4fa9f766c92ce000aed103fb2a5f54..634f60b86d43eb1542a8899ceb764ecce34f80ee 100644
+index 69feb8ee4dd959554a6fb9ccae78e32870b0e7b3..67e23add4ca538083b5beb54833e1776efcb4a80 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -571,7 +571,7 @@ public class ServerChunkCache extends ChunkSource {

diff --git a/...ver/0013-Divine-Feature-secure-seed.patch → ...ver/0012-Divine-Feature-secure-seed.patch b/...ver/0013-Divine-Feature-secure-seed.patch → ...ver/0012-Divine-Feature-secure-seed.patch
diff --git a/.../0014-Pufferfish-Add-SIMD-utilities.patch → .../0013-Pufferfish-Add-SIMD-utilities.patch b/.../0014-Pufferfish-Add-SIMD-utilities.patch → .../0013-Pufferfish-Add-SIMD-utilities.patch
diff --git a/...lice-Improve-map-saving-performance.patch → ...lice-Improve-map-saving-performance.patch b/...lice-Improve-map-saving-performance.patch → ...lice-Improve-map-saving-performance.patch
diff --git a/.../server/0016-Divine-lithium-ai.raid.patch → .../server/0015-Divine-lithium-ai.raid.patch b/.../server/0016-Divine-lithium-ai.raid.patch → .../server/0015-Divine-lithium-ai.raid.patch
diff --git a/...tity.fast_elytra_check-entity.fast_.patch → ...tity.fast_elytra_check-entity.fast_.patch b/...tity.fast_elytra_check-entity.fast_.patch → ...tity.fast_elytra_check-entity.fast_.patch
diff --git a/...Carpet-Fixes-RecipeManager-Optimize.patch → ...Carpet-Fixes-RecipeManager-Optimize.patch b/...Carpet-Fixes-RecipeManager-Optimize.patch → ...Carpet-Fixes-RecipeManager-Optimize.patch
@@ -7,7 +7,7 @@ Original project: https://github.com/fxmorin/carpet-fixes
 Improves: [Blast]Furnace/Campfire/Smoker/Stonecutter/Crafting/Sheep Color Choosing
 
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index a31326e24cb68472c81cd781c5e3041772712862..a6dd4a621372afe10439e1ec3306b5b6d7d671c6 100644
+index 9d0ac3fb52a76a97bf954fbc5175cea90d385d8c..b98aa5d3e50ba21dcd314d7ac8ceca6f856327da 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 @@ -12,13 +12,9 @@ import com.google.gson.JsonObject;

diff --git a/...rver/0019-Divine-Reduce-sensor-work.patch → ...rver/0018-Divine-Reduce-sensor-work.patch b/...rver/0019-Divine-Reduce-sensor-work.patch → ...rver/0018-Divine-Reduce-sensor-work.patch
@@ -7,7 +7,7 @@ Original project: Bloom-host/Petal
 Link: https://github.com/Bloom-host/Petal
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 148e6880ee90be7a4b5523b9768dff720b91592c..5d74190ca751e025e833fa39af0f5067e9ef892b 100644
+index fc4f65d61fa21ed40c561596840e993f03bde648..b4c4437e5580c0010bf84a9c7178e89d43f57c80 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -126,6 +126,7 @@ import net.minecraft.world.phys.HitResult;

diff --git a/...ed-server-showing-in-ping-before-se.patch → ...ed-server-showing-in-ping-before-se.patch b/...ed-server-showing-in-ping-before-se.patch → ...ed-server-showing-in-ping-before-se.patch
diff --git a/...-to-moisten-from-water-directly-und.patch → ...-to-moisten-from-water-directly-und.patch b/...-to-moisten-from-water-directly-und.patch → ...-to-moisten-from-water-directly-und.patch
diff --git a/...2-Purpur-Lobotomize-stuck-villagers.patch → ...1-Purpur-Lobotomize-stuck-villagers.patch b/...2-Purpur-Lobotomize-stuck-villagers.patch → ...1-Purpur-Lobotomize-stuck-villagers.patch
diff --git a/...cked-hopper-no-longer-send-NC-updat.patch → ...cked-hopper-no-longer-send-NC-updat.patch b/...cked-hopper-no-longer-send-NC-updat.patch → ...cked-hopper-no-longer-send-NC-updat.patch
diff --git a/...s/server/0024-Leaves-Vanilla-hopper.patch → ...s/server/0023-Leaves-Vanilla-hopper.patch b/...s/server/0024-Leaves-Vanilla-hopper.patch → ...s/server/0023-Leaves-Vanilla-hopper.patch
diff --git a/...rver/0025-Plazma-Lithium-HashedList.patch → ...rver/0024-Plazma-Lithium-HashedList.patch b/...rver/0025-Plazma-Lithium-HashedList.patch → ...rver/0024-Plazma-Lithium-HashedList.patch
diff --git a/...6-Plazma-Optimise-state-lookup-more.patch → ...5-Plazma-Optimise-state-lookup-more.patch b/...6-Plazma-Optimise-state-lookup-more.patch → ...5-Plazma-Optimise-state-lookup-more.patch
diff --git a/...-which-zone-has-which-players-in-tp.patch → ...-which-zone-has-which-players-in-tp.patch b/...-which-zone-has-which-players-in-tp.patch → ...-which-zone-has-which-players-in-tp.patch
diff --git a/...xperimental-Disable-respawn-ceiling.patch → ...xperimental-Disable-respawn-ceiling.patch b/...xperimental-Disable-respawn-ceiling.patch → ...xperimental-Disable-respawn-ceiling.patch
diff --git a/...dom-flatten-triangular-distribution.patch → ...dom-flatten-triangular-distribution.patch b/...dom-flatten-triangular-distribution.patch → ...dom-flatten-triangular-distribution.patch
diff --git a/...ves-Cache-world-generator-sea-level.patch → ...ves-Cache-world-generator-sea-level.patch b/...ves-Cache-world-generator-sea-level.patch → ...ves-Cache-world-generator-sea-level.patch
diff --git a/...0031-The-anvil-becomes-a-drop-at-Y0.patch → ...0030-The-anvil-becomes-a-drop-at-Y0.patch b/...0031-The-anvil-becomes-a-drop-at-Y0.patch → ...0030-The-anvil-becomes-a-drop-at-Y0.patch
diff --git a/...erver/0032-Graphite-Player-Skin-API.patch → ...erver/0031-Graphite-Player-Skin-API.patch b/...erver/0032-Graphite-Player-Skin-API.patch → ...erver/0031-Graphite-Player-Skin-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Graphite: Player Skin API
 Ability to change a player's skin easily through new API
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d7299d46ac7d718d59bd6fb14859f77273e10aab..d91e4a0f53a155ac9468ca7311e7e5c91fc3007e 100644
+index 93905d059a732697c39325ec5ab00ce0047cc43e..f1c0192dca086355961709e1c6de11aac79a068f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -1,20 +1,14 @@
@@ -72,7 +72,7 @@ index d7299d46ac7d718d59bd6fb14859f77273e10aab..d91e4a0f53a155ac9468ca7311e7e5c9
              })
              .join();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ae53333f8ebffea8874259495026484b003d1ad9..b60ca43bc161abff975d3b88036e320e94d11299 100644
+index a3aca277422d623c6998bbbe5d9574cd1e10f544..3895ebf1ba3156ce346a6d632ca39c70f92c4067 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -159,7 +159,6 @@ import org.bukkit.craftbukkit.map.CraftMapView;

diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch