From a476b12f33803274b10fd07cd25012a9b0a772f2 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 1 Aug 2025 19:11:33 +0800 Subject: [PATCH] [ci skip] Change to new lithium repo --- .../0081-Replace-AI-goal-set-with-optimized-collection.patch | 2 +- ...Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch | 2 +- .../mcserver/0064-Cache-world-generator-sea-level.patch | 2 +- .../removed/1.21.4/mcserver/0127-Lithium-HashedList.patch | 2 +- .../0051-Replace-class-map-with-optimized-collection.patch | 2 +- ...Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch | 2 +- ...092-Optimize-world-generation-chunk-and-block-access.patch | 2 +- .../work/server/0079-Cache-CubeVoxelShape-shape-array.patch | 2 +- .../work/server/0079-Cache-ominous-banner-item.patch | 2 +- ...Reduce-lambda-and-Optional-allocation-in-EntityBased.patch | 2 +- ...049-Replace-game-rules-map-with-optimized-collection.patch | 2 +- ...050-Replace-AI-attributes-with-optimized-collections.patch | 2 +- ...Replace-division-by-multiplication-in-CubePointRange.patch | 2 +- .../0056-Check-frozen-ticks-before-landing-block.patch | 2 +- .../features/0057-Faster-chunk-serialization.patch | 4 ++-- .../features/0058-Update-boss-bar-within-tick.patch | 2 +- .../features/0059-Skip-secondary-POI-sensor-if-absent.patch | 2 +- ...Lithium-Skip-unnecessary-calculations-if-player-is-n.patch | 2 +- .../minecraft-patches/features/0181-Lithium-fast-util.patch | 2 +- .../features/0182-Lithium-cached-iterate-outwards.patch | 2 +- .../main/java/org/dreeam/leaf/util/map/BlockPosIterator.java | 3 ++- 21 files changed, 23 insertions(+), 22 deletions(-) diff --git a/leaf-archived-patches/removed/1.20.5/server/0081-Replace-AI-goal-set-with-optimized-collection.patch b/leaf-archived-patches/removed/1.20.5/server/0081-Replace-AI-goal-set-with-optimized-collection.patch index d2b2061c..bdc331f4 100644 --- a/leaf-archived-patches/removed/1.20.5/server/0081-Replace-AI-goal-set-with-optimized-collection.patch +++ b/leaf-archived-patches/removed/1.20.5/server/0081-Replace-AI-goal-set-with-optimized-collection.patch @@ -11,7 +11,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "me/jellysquid/mods/lithium/mixin/collections/goals/GoalSelectorMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java diff --git a/leaf-archived-patches/removed/1.21.1/sever/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaf-archived-patches/removed/1.21.1/sever/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch index 1ee88918..c4dce2b4 100644 --- a/leaf-archived-patches/removed/1.21.1/sever/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch +++ b/leaf-archived-patches/removed/1.21.1/sever/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch @@ -11,7 +11,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "me/jellysquid/mods/lithium/mixin/collections/entity_filtering/TypeFilterableListMixin.java" By: Angeline -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java diff --git a/leaf-archived-patches/removed/1.21.4/mcserver/0064-Cache-world-generator-sea-level.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0064-Cache-world-generator-sea-level.patch index 7e50ea1a..875cdfe5 100644 --- a/leaf-archived-patches/removed/1.21.4/mcserver/0064-Cache-world-generator-sea-level.patch +++ b/leaf-archived-patches/removed/1.21.4/mcserver/0064-Cache-world-generator-sea-level.patch @@ -12,7 +12,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/gen/cached_generator_settings/NoiseBasedChunkGeneratorMixin.java" By: SuperCoder7979 -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java diff --git a/leaf-archived-patches/removed/1.21.4/mcserver/0127-Lithium-HashedList.patch b/leaf-archived-patches/removed/1.21.4/mcserver/0127-Lithium-HashedList.patch index ae19337c..74af2ec2 100644 --- a/leaf-archived-patches/removed/1.21.4/mcserver/0127-Lithium-HashedList.patch +++ b/leaf-archived-patches/removed/1.21.4/mcserver/0127-Lithium-HashedList.patch @@ -9,7 +9,7 @@ This patch is based on the following mixins: * "me/jellysquid/mods/lithium/mixin/world/block_entity_ticking/collections/WorldMixin.java" (1.16.x/dev branch) * "net/caffeinemc/mods/lithium/common/util/collections/HashedReferenceList.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/leaf-archived-patches/removed/1.21.7/mcserver/0051-Replace-class-map-with-optimized-collection.patch b/leaf-archived-patches/removed/1.21.7/mcserver/0051-Replace-class-map-with-optimized-collection.patch index 640f0202..cf2d6ea4 100644 --- a/leaf-archived-patches/removed/1.21.7/mcserver/0051-Replace-class-map-with-optimized-collection.patch +++ b/leaf-archived-patches/removed/1.21.7/mcserver/0051-Replace-class-map-with-optimized-collection.patch @@ -13,7 +13,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/collections/entity_by_type/ClassInstanceMultiMapMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/util/ClassInstanceMultiMap.java b/net/minecraft/util/ClassInstanceMultiMap.java diff --git a/leaf-archived-patches/removed/1.21.7/mcserver/0054-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaf-archived-patches/removed/1.21.7/mcserver/0054-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch index cbd1809d..9f503cee 100644 --- a/leaf-archived-patches/removed/1.21.7/mcserver/0054-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch +++ b/leaf-archived-patches/removed/1.21.7/mcserver/0054-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch @@ -18,7 +18,7 @@ Licensed under: MIT (https://opensource.org/licenses/MIT) "net/caffeinemc/mods/lithium/mixin/collections/entity_filtering/ClassInstanceMultiMapMixin.java" By: Angeline -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/util/ClassInstanceMultiMap.java b/net/minecraft/util/ClassInstanceMultiMap.java diff --git a/leaf-archived-patches/removed/1.21/server/0092-Optimize-world-generation-chunk-and-block-access.patch b/leaf-archived-patches/removed/1.21/server/0092-Optimize-world-generation-chunk-and-block-access.patch index a20d437a..867761af 100644 --- a/leaf-archived-patches/removed/1.21/server/0092-Optimize-world-generation-chunk-and-block-access.patch +++ b/leaf-archived-patches/removed/1.21/server/0092-Optimize-world-generation-chunk-and-block-access.patch @@ -12,7 +12,7 @@ This patch is based on the following mixins and classes: * "me/jellysquid/mods/lithium/common/util/Pos.java" * "me/jellysquid/mods/lithium/mixin/gen/chunk_region/ChunkRegionMixin.java" By: SuperCoder7979 , 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/Pos.java b/src/main/java/me/jellysquid/mods/lithium/common/util/Pos.java diff --git a/leaf-archived-patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch b/leaf-archived-patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch index ac35f2f6..1d270133 100644 --- a/leaf-archived-patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch +++ b/leaf-archived-patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "me/jellysquid/mods/lithium/mixin/shapes/precompute_shape_arrays/SimpleVoxelShapeMixin.java" By: Angeline -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/phys/shapes/CubeVoxelShape.java b/src/main/java/net/minecraft/world/phys/shapes/CubeVoxelShape.java diff --git a/leaf-archived-patches/work/server/0079-Cache-ominous-banner-item.patch b/leaf-archived-patches/work/server/0079-Cache-ominous-banner-item.patch index 12a01d5a..4319b367 100644 --- a/leaf-archived-patches/work/server/0079-Cache-ominous-banner-item.patch +++ b/leaf-archived-patches/work/server/0079-Cache-ominous-banner-item.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "me/jellysquid/mods/lithium/mixin/ai/raid/RaiderEntityMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java b/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java diff --git a/leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch index 3dd0e721..1051f4bf 100644 --- a/leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch +++ b/leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch @@ -10,7 +10,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/alloc/explosion_behavior/EntityBasedExplosionDamageCalculatorMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java b/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java diff --git a/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch index 5018a2ff..f76f8ee0 100644 --- a/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch +++ b/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/collections/gamerules/GameRulesMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/level/GameRules.java b/net/minecraft/world/level/GameRules.java diff --git a/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch b/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch index 27225a8b..393e129a 100644 --- a/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch +++ b/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/collections/attributes/AttributeMapMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java diff --git a/leaf-server/minecraft-patches/features/0054-Replace-division-by-multiplication-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0054-Replace-division-by-multiplication-in-CubePointRange.patch index 34944fec..9b2a6f68 100644 --- a/leaf-server/minecraft-patches/features/0054-Replace-division-by-multiplication-in-CubePointRange.patch +++ b/leaf-server/minecraft-patches/features/0054-Replace-division-by-multiplication-in-CubePointRange.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/shapes/precompute_shape_arrays/CubePointRangeMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/phys/shapes/CubePointRange.java b/net/minecraft/world/phys/shapes/CubePointRange.java diff --git a/leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch b/leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch index b4fad295..2543e2ac 100644 --- a/leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch +++ b/leaf-server/minecraft-patches/features/0056-Check-frozen-ticks-before-landing-block.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/entity/fast_powder_snow_check/LivingEntityMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java diff --git a/leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch b/leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch index d23bd021..9340048a 100644 --- a/leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch +++ b/leaf-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch @@ -12,7 +12,7 @@ This patch is based on the following mixins and classes: * "net/caffeinemc/mods/lithium/mixin/chunk/serialization/SimpleBitStorageMixin.java" * "net/caffeinemc/mods/lithium/mixin/chunk/serialization/PalettedContainerMixin.java" By: Angeline -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/util/BitStorage.java b/net/minecraft/util/BitStorage.java @@ -155,7 +155,7 @@ index a251ba67644cd02a0b00d7c8b0e2c64aa5e26291..59d48e7dc0911557c57a7e07f5f9013c + storage.compact(this.data.palette(), compactedPalette, array); + + // If the palette didn't change during compaction, do a simple copy of the data array -+ if (hashPalette != null && hashPalette.getSize() == compactedPalette.getSize() && storage.getBits() == strategy.calculateBitsForSerialization(registry, hashPalette.getSize())) { // paletteSize can de-sync from palette - see https://github.com/CaffeineMC/lithium-fabric/issues/279 ++ if (hashPalette != null && hashPalette.getSize() == compactedPalette.getSize() && storage.getBits() == strategy.calculateBitsForSerialization(registry, hashPalette.getSize())) { // paletteSize can de-sync from palette - see https://github.com/CaffeineMC/lithium/issues/279 + data = this.asOptional(storage.getRaw().clone()); + elements = hashPalette.getElements(); + } else { diff --git a/leaf-server/minecraft-patches/features/0058-Update-boss-bar-within-tick.patch b/leaf-server/minecraft-patches/features/0058-Update-boss-bar-within-tick.patch index d99d4b07..a446950c 100644 --- a/leaf-server/minecraft-patches/features/0058-Update-boss-bar-within-tick.patch +++ b/leaf-server/minecraft-patches/features/0058-Update-boss-bar-within-tick.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/ai/raid/RaidMixin.java" By: Angeline -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java diff --git a/leaf-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch b/leaf-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch index acdc270d..62076347 100644 --- a/leaf-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch +++ b/leaf-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch @@ -9,7 +9,7 @@ Gale - https://galemc.org This patch is based on the following mixin: "net/caffeinemc/mods/lithium/mixin/ai/sensor/secondary_poi/SecondaryPoiSensorMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) * Lithium description * diff --git a/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch index 632e0d3f..49ef5847 100644 --- a/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch +++ b/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch @@ -8,7 +8,7 @@ This patch is based on the following mixins: * "net/caffeinemc/mods/lithium/mixin/entity/fast_elytra_check/LivingEntityMixin.java" * "net/caffeinemc/mods/lithium/mixin/entity/fast_hand_swing/LivingEntityMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java diff --git a/leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch b/leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch index c63dd011..c1d03054 100644 --- a/leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch +++ b/leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch @@ -7,7 +7,7 @@ This patch is based on the following mixins: * "net/caffeinemc/mods/lithium/mixin/math/fast_util/DirectionMixin.java" * "net/caffeinemc/mods/lithium/mixin/math/fast_util/AABBMixin.java" By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/core/Direction.java b/net/minecraft/core/Direction.java diff --git a/leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch b/leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch index 907e2b35..381c0ea3 100644 --- a/leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch +++ b/leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch @@ -4,7 +4,7 @@ Date: Fri, 8 Nov 2024 00:06:34 +0100 Subject: [PATCH] Lithium: cached iterate outwards By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/core/BlockPos.java b/net/minecraft/core/BlockPos.java diff --git a/leaf-server/src/main/java/org/dreeam/leaf/util/map/BlockPosIterator.java b/leaf-server/src/main/java/org/dreeam/leaf/util/map/BlockPosIterator.java index 2165d64e..0efed452 100644 --- a/leaf-server/src/main/java/org/dreeam/leaf/util/map/BlockPosIterator.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/util/map/BlockPosIterator.java @@ -1,6 +1,7 @@ package org.dreeam.leaf.util.map; import com.google.common.collect.AbstractIterator; +import com.google.common.collect.Collections2; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.util.Mth; @@ -21,7 +22,7 @@ public final class BlockPosIterator extends AbstractIterator { private @Nullable MutableBlockPos pos = null; public static Iterable iterable(AABB bb) { - return () -> new BlockPosIterator(bb); + return new BlockPosIterator(bb); } public static Iterable traverseArea(Vec3 vec, AABB boundingBox) {