diff --git a/leaf-server/minecraft-patches/features/0012-Remove-UseItemOnPacket-Too-Far-Check.patch b/leaf-server/minecraft-patches/features/0012-Remove-UseItemOnPacket-Too-Far-check.patch similarity index 88% rename from leaf-server/minecraft-patches/features/0012-Remove-UseItemOnPacket-Too-Far-Check.patch rename to leaf-server/minecraft-patches/features/0012-Remove-UseItemOnPacket-Too-Far-check.patch index 763b9d6f..6a9ed2c0 100644 --- a/leaf-server/minecraft-patches/features/0012-Remove-UseItemOnPacket-Too-Far-Check.patch +++ b/leaf-server/minecraft-patches/features/0012-Remove-UseItemOnPacket-Too-Far-check.patch @@ -1,13 +1,13 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 18 Nov 2022 23:26:16 -0500 -Subject: [PATCH] Remove UseItemOnPacket Too Far Check +Subject: [PATCH] Remove UseItemOnPacket Too Far check This Check is added in 1.17.x -> 1.18.x that updated by Mojang. By removing this check, it gives ability for hackers to use some modules of hack clients. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ec6276f3335fd963c8554dbc43adf5bdfe3d2412..cb0b9a13d744115f45489677912c854a64afc03a 100644 +index ec6276f3335fd963c8554dbc43adf5bdfe3d2412..c58a231183655e2910748a5ecdf3b2ce0d7b00a1 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1998,8 +1998,13 @@ public class ServerGamePacketListenerImpl @@ -16,13 +16,13 @@ index ec6276f3335fd963c8554dbc43adf5bdfe3d2412..cb0b9a13d744115f45489677912c854a Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos)); - double d = 1.0000001; - if (Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) { -+ // Leaf start - Remove UseItemOnPacket Too Far Check and make it configurable ++ // Leaf start - Remove UseItemOnPacket Too Far check + //double d = 1.0000001; + final double maxDistance = org.dreeam.leaf.config.modules.gameplay.ConfigurableMaxUseItemDistance.maxUseItemDistance; + if (maxDistance <= 0 + || (Math.abs(vec3.x()) < maxDistance && Math.abs(vec3.y()) < maxDistance && Math.abs(vec3.z()) < maxDistance) + ) { -+ // Leaf end - Remove UseItemOnPacket Too Far Check and make it configurable ++ // Leaf end - Remove UseItemOnPacket Too Far check Direction direction = hitResult.getDirection(); this.player.resetLastActionTime(); int maxY = this.player.level().getMaxY(); diff --git a/leaf-server/minecraft-patches/features/0048-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/leaf-server/minecraft-patches/features/0013-Remove-change-non-editable-sign-warning.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0048-Prevent-change-non-editable-sign-warning-spam-in-con.patch rename to leaf-server/minecraft-patches/features/0013-Remove-change-non-editable-sign-warning.patch index 5126bda3..0d96a34f 100644 --- a/leaf-server/minecraft-patches/features/0048-Prevent-change-non-editable-sign-warning-spam-in-con.patch +++ b/leaf-server/minecraft-patches/features/0013-Remove-change-non-editable-sign-warning.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:04:35 -0400 -Subject: [PATCH] Prevent change non-editable sign warning spam in console +Subject: [PATCH] Remove change non-editable sign warning diff --git a/net/minecraft/world/level/block/entity/SignBlockEntity.java b/net/minecraft/world/level/block/entity/SignBlockEntity.java diff --git a/leaf-server/minecraft-patches/features/0013-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/leaf-server/minecraft-patches/features/0014-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0013-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch rename to leaf-server/minecraft-patches/features/0014-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch diff --git a/leaf-server/minecraft-patches/features/0014-Carpet-Fixes-Optimized-getBiome-method.patch b/leaf-server/minecraft-patches/features/0015-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0014-Carpet-Fixes-Optimized-getBiome-method.patch rename to leaf-server/minecraft-patches/features/0015-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/leaf-server/minecraft-patches/features/0015-Carpet-Fixes-Use-optimized-RecipeManager.patch b/leaf-server/minecraft-patches/features/0016-Carpet-Fixes-Use-optimized-RecipeManager.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0015-Carpet-Fixes-Use-optimized-RecipeManager.patch rename to leaf-server/minecraft-patches/features/0016-Carpet-Fixes-Use-optimized-RecipeManager.patch diff --git a/leaf-server/minecraft-patches/features/0016-Akarin-Save-Json-list-asynchronously.patch b/leaf-server/minecraft-patches/features/0017-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0016-Akarin-Save-Json-list-asynchronously.patch rename to leaf-server/minecraft-patches/features/0017-Akarin-Save-Json-list-asynchronously.patch diff --git a/leaf-server/minecraft-patches/features/0017-Slice-Smooth-Teleports.patch b/leaf-server/minecraft-patches/features/0018-Slice-Smooth-Teleports.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0017-Slice-Smooth-Teleports.patch rename to leaf-server/minecraft-patches/features/0018-Slice-Smooth-Teleports.patch index d88028b8..97a53b25 100644 --- a/leaf-server/minecraft-patches/features/0017-Slice-Smooth-Teleports.patch +++ b/leaf-server/minecraft-patches/features/0018-Slice-Smooth-Teleports.patch @@ -9,7 +9,7 @@ Original project: https://github.com/Cryptite/Slice Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b7829a91a7ef79706ec6d90b8b2673fd369b9931..c798869665397de5b435e992873b566f766c2ff9 100644 +index 1173deb1aeb5abc225e7b5914cc3c325afdfab16..00c7afd995d179efe1c96fb6daf342b6b357fa65 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -396,6 +396,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/leaf-server/minecraft-patches/features/0018-Parchment-Make-FixLight-use-action-bar.patch b/leaf-server/minecraft-patches/features/0019-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0018-Parchment-Make-FixLight-use-action-bar.patch rename to leaf-server/minecraft-patches/features/0019-Parchment-Make-FixLight-use-action-bar.patch diff --git a/leaf-server/minecraft-patches/features/0019-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0020-Leaves-Protocol-Core.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0019-Leaves-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0020-Leaves-Protocol-Core.patch index 668eeab0..1c19db9d 100644 --- a/leaf-server/minecraft-patches/features/0019-Leaves-Protocol-Core.patch +++ b/leaf-server/minecraft-patches/features/0020-Leaves-Protocol-Core.patch @@ -54,7 +54,7 @@ index ea8cfa76093c70a44d065c1f80adaa9127fe4e07..7435e2c3f0defe98cbaa488219974887 assert isValidPath(path); diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 919dc4dddea64f97161b5e0d417dc06875f8318c..4f307671699b0dfbdab61257e28c5a90bcf2e049 100644 +index e31c753a800070cffafa76bde044dee146480e80..42845c03fc94a589bfad6a2ae1e5e7f8d577ef16 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1753,6 +1753,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop entityType, Level level) { diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java -index 8468f7095e1db7a54042ce9a97d991d3105bd535..fd1aa79d1d1ec05853762df0c99099af3b790c63 100644 +index ec9db1c12426db80dbf02d704e6c7ec867d59f6f..0fdda6b24aee95170e54079e53125b4aed19ac0b 100644 --- a/net/minecraft/world/entity/animal/frog/Tadpole.java +++ b/net/minecraft/world/entity/animal/frog/Tadpole.java @@ -285,7 +285,7 @@ public class Tadpole extends AbstractFish { diff --git a/leaf-server/minecraft-patches/features/0021-Leaves-Xaero-Map-Protocol.patch b/leaf-server/minecraft-patches/features/0022-Leaves-Xaero-Map-Protocol.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0021-Leaves-Xaero-Map-Protocol.patch rename to leaf-server/minecraft-patches/features/0022-Leaves-Xaero-Map-Protocol.patch index e60d191d..d0fa57a3 100644 --- a/leaf-server/minecraft-patches/features/0021-Leaves-Xaero-Map-Protocol.patch +++ b/leaf-server/minecraft-patches/features/0022-Leaves-Xaero-Map-Protocol.patch @@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves This patch is Powered by Xaero Map diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index e8d458ab8094434d4af3441f6ade2bb47e30868f..f4ac7a383ea9732a915d100ec9a83e225a1a383d 100644 +index 3d1338b463466d833b53eff50ec1366f41329dd8..823a7c330ec7f0287b4f7a83e2c719a45cbedf6e 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -1216,6 +1216,7 @@ public abstract class PlayerList { diff --git a/leaf-server/minecraft-patches/features/0022-Leaves-Syncmatica-Protocol.patch b/leaf-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0022-Leaves-Syncmatica-Protocol.patch rename to leaf-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch index a9c2ed0f..1dc4ae46 100644 --- a/leaf-server/minecraft-patches/features/0022-Leaves-Syncmatica-Protocol.patch +++ b/leaf-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch @@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves This patch is Powered by Syncmatica (https://github.com/End-Tech/syncmatica) diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 162617ea984e54898f19c16ff8e7d759bddcc190..7e656b426aafc2581e13e8a1ae9e304530f3d05b 100644 +index c58a231183655e2910748a5ecdf3b2ce0d7b00a1..ffb8d4c5b894e130d7e330459e9797356db2a262 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -324,6 +324,7 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0023-Leaves-Replay-Mod-API.patch b/leaf-server/minecraft-patches/features/0024-Leaves-Replay-Mod-API.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0023-Leaves-Replay-Mod-API.patch rename to leaf-server/minecraft-patches/features/0024-Leaves-Replay-Mod-API.patch index 9a0a4ffd..33490a78 100644 --- a/leaf-server/minecraft-patches/features/0023-Leaves-Replay-Mod-API.patch +++ b/leaf-server/minecraft-patches/features/0024-Leaves-Replay-Mod-API.patch @@ -123,7 +123,7 @@ index b305ba9bab617bf4e52d0e6ddf160bacc5751a94..b8215b71971d16705bc11f19343823ac if (players.size() >= resultLimit) { return players; diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 4f307671699b0dfbdab61257e28c5a90bcf2e049..449cfd4f6282f28d7470403c0063874b906a6003 100644 +index 42845c03fc94a589bfad6a2ae1e5e7f8d577ef16..8499ee1505c0390f98d1555d47a671541727dbf8 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1656,7 +1656,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java -index 5748658abf0b90812005ae9d426df92daf5532f0..bb404b4cfdc364b21cb322bc142f9e72384397d0 100644 +index 5748658abf0b90812005ae9d426df92daf5532f0..4a0eed7d7645ed539857592d233214e9a74499f1 100644 --- a/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java @@ -114,7 +114,17 @@ public class DedicatedServerProperties extends Settings GsonHelper.parse(!property.isEmpty() ? property : "{}"), new JsonObject()), this.get("level-type", property -> property.toLowerCase(Locale.ROOT), WorldPresets.NORMAL.location().toString()) diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java -index 77676b38912e558a4ba0c65a009af4cdc531c5fa..eacebc190a1f598314a8b812629fecd86d87ff7c 100644 +index f618d3cf32be10b9ca3833231e653975bcf56e4c..92e70e132a86930d9cd0db32f10e106427621c7d 100644 --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java @@ -697,6 +697,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon } public ChunkGenerator getGenerator() { -+ su.plo.matter.Globals.setupGlobals(level); // Leaf - Matter - Feature Secure Seed ++ su.plo.matter.Globals.setupGlobals(level); // Leaf - Matter - Secure Seed return this.chunkMap.generator(); } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index bf364e3fad2823400ec671bc632ba50751a3f473..b3c388f6108360708baf275121af18f46622494f 100644 +index bf364e3fad2823400ec671bc632ba50751a3f473..22b929d30938a26837b21511425c62fc1665a669 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -633,6 +633,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe chunkGenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkGenerator, gen); } // CraftBukkit end -+ su.plo.matter.Globals.setupGlobals(this); // Leaf - Matter - Feature Secure Seed ++ su.plo.matter.Globals.setupGlobals(this); // Leaf - Matter - Secure Seed boolean flag = server.forceSynchronousWrites(); DataFixer fixerUpper = server.getFixerUpper(); // Paper - rewrite chunk system diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java -index 240a54b210e23d5b79e6bcaf3806aa454668135d..d075c7afaddc7102eed64ef4bd2b096e4972153a 100644 +index 240a54b210e23d5b79e6bcaf3806aa454668135d..c562af16e20c2127482ea1f769ad042d36dbb1f6 100644 --- a/net/minecraft/world/entity/monster/Slime.java +++ b/net/minecraft/world/entity/monster/Slime.java @@ -424,7 +424,12 @@ public class Slime extends Mob implements Enemy { @@ -68,27 +68,27 @@ index 240a54b210e23d5b79e6bcaf3806aa454668135d..d075c7afaddc7102eed64ef4bd2b096e ChunkPos chunkPos = new ChunkPos(pos); - boolean flag = level.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkPos.x, chunkPos.z, ((WorldGenLevel) level).getSeed(), level.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + boolean isSlimeChunk = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled + ? level.getChunk(chunkPos.x, chunkPos.z).isSlimeChunk() + : WorldgenRandom.seedSlimeChunk(chunkPos.x, chunkPos.z, ((WorldGenLevel) level).getSeed(), level.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper + boolean flag = level.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || isSlimeChunk; -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed // Paper start - Replace rules for Height in Slime Chunks final double maxHeightSlimeChunk = level.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.slimeChunk.maximum; if (random.nextInt(10) == 0 && flag && pos.getY() < maxHeightSlimeChunk) { diff --git a/net/minecraft/world/level/chunk/ChunkAccess.java b/net/minecraft/world/level/chunk/ChunkAccess.java -index 6d565b52552534ce9cacfc35ad1bf4adcb69eac3..1e7df840abb7aab466770ff35429e7c300dff4ac 100644 +index 6d565b52552534ce9cacfc35ad1bf4adcb69eac3..3a6db5bc0c8be7d68e15317a621c1965fdc3a9bd 100644 --- a/net/minecraft/world/level/chunk/ChunkAccess.java +++ b/net/minecraft/world/level/chunk/ChunkAccess.java @@ -87,6 +87,10 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh public org.bukkit.craftbukkit.persistence.DirtyCraftPersistentDataContainer persistentDataContainer = new org.bukkit.craftbukkit.persistence.DirtyCraftPersistentDataContainer(ChunkAccess.DATA_TYPE_REGISTRY); // CraftBukkit end public final Registry biomeRegistry; // CraftBukkit -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + private boolean slimeChunk; + private boolean hasComputedSlimeChunk; -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed // Paper start - rewrite chunk system private volatile ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] blockNibbles; @@ -96,7 +96,7 @@ index 6d565b52552534ce9cacfc35ad1bf4adcb69eac3..1e7df840abb7aab466770ff35429e7c3 return GameEventListenerRegistry.NOOP; } -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + public boolean isSlimeChunk() { + if (!hasComputedSlimeChunk) { + hasComputedSlimeChunk = true; @@ -105,13 +105,13 @@ index 6d565b52552534ce9cacfc35ad1bf4adcb69eac3..1e7df840abb7aab466770ff35429e7c3 + + return slimeChunk; + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed + public abstract BlockState getBlockState(final int x, final int y, final int z); // Paper @Nullable public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean isMoving); diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java -index 6ed51cf42b5864194d671b5b56f5b9bdf0291dc0..2b19e989b4475e905d77bf9d47403c724b81fccd 100644 +index 6ed51cf42b5864194d671b5b56f5b9bdf0291dc0..8a4ce8b3b050ad9fb7de007129f5f460110d0b09 100644 --- a/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -343,7 +343,11 @@ public abstract class ChunkGenerator { @@ -119,80 +119,79 @@ index 6ed51cf42b5864194d671b5b56f5b9bdf0291dc0..2b19e989b4475e905d77bf9d47403c72 Map> map = registry.stream().collect(Collectors.groupingBy(structure1 -> structure1.step().ordinal())); List list = this.featuresPerStep.get(); - WorldgenRandom worldgenRandom = new WorldgenRandom(new XoroshiroRandomSource(RandomSupport.generateUniqueSeed())); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled + ? new su.plo.matter.WorldgenCryptoRandom(blockPos.getX(), blockPos.getZ(), su.plo.matter.Globals.Salt.UNDEFINED, 0) + : new WorldgenRandom(new XoroshiroRandomSource(RandomSupport.generateUniqueSeed())); -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed long l = worldgenRandom.setDecorationSeed(level.getSeed(), blockPos.getX(), blockPos.getZ()); Set> set = new ObjectArraySet<>(); ChunkPos.rangeClosed(sectionPos.chunk(), 1).forEach(chunkPos -> { -@@ -556,8 +560,17 @@ public abstract class ChunkGenerator { +@@ -556,8 +560,15 @@ public abstract class ChunkGenerator { } else { ArrayList list1 = new ArrayList<>(list.size()); list1.addAll(list); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(structureState.getLevelSeed(), pos.x, pos.z); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom; + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { -+ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom( -+ pos.x, pos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, 0 -+ ); ++ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(pos.x, pos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, 0); + } else { + worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + worldgenRandom.setLargeFeatureSeed(structureState.getLevelSeed(), pos.x, pos.z); + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed int i = 0; for (StructureSet.StructureSelectionEntry structureSelectionEntry1 : list1) { diff --git a/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java -index 4483d7764ddca635fb6fb841fdc2185357106fc5..19b5d09d4f185a4f1600baade21bd897a6c8b849 100644 +index f07a5416e5dc7e9a798a78ce9573a0c42bc59d04..426692d9627f46d708f551bd22ce3c52b2a23b37 100644 --- a/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java +++ b/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java -@@ -205,7 +205,11 @@ public class ChunkGeneratorStructureState { +@@ -205,7 +205,12 @@ public class ChunkGeneratorStructureState { List> list = new ArrayList<>(count); int spread = placement.spread(); HolderSet holderSet = placement.preferredBiomes(); - RandomSource randomSource = RandomSource.create(); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + RandomSource randomSource = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled + ? new su.plo.matter.WorldgenCryptoRandom(0, 0, su.plo.matter.Globals.Salt.STRONGHOLDS, 0) + : RandomSource.create(); ++ // Leaf end - Matter - Secure Seed + if (!org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { // Paper start - Add missing structure set seed configs if (this.conf.strongholdSeed != null && structureSet.is(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS)) { randomSource.setSeed(this.conf.strongholdSeed); -@@ -213,6 +217,7 @@ public class ChunkGeneratorStructureState { +@@ -213,6 +218,7 @@ public class ChunkGeneratorStructureState { // Paper end - Add missing structure set seed configs randomSource.setSeed(this.concentricRingsSeed); } // Paper - Add missing structure set seed configs -+ } // Leaf end - Matter - Feature Secure Seed ++ } // Leaf - Matter - Secure Seed double d = randomSource.nextDouble() * Math.PI * 2.0; int i = 0; int i1 = 0; diff --git a/net/minecraft/world/level/chunk/status/ChunkStep.java b/net/minecraft/world/level/chunk/status/ChunkStep.java -index b8348976e80578d9eff64eea68c04c603fed49ad..37735784e26651456c32c6b392bce53a8416529d 100644 +index b8348976e80578d9eff64eea68c04c603fed49ad..bc5c6ea1f1e4f1608a70116f03fb2a58ca3252c3 100644 --- a/net/minecraft/world/level/chunk/status/ChunkStep.java +++ b/net/minecraft/world/level/chunk/status/ChunkStep.java @@ -60,6 +60,7 @@ public final class ChunkStep implements ca.spottedleaf.moonrise.patches.chunk_sy } public CompletableFuture apply(WorldGenContext worldGenContext, StaticCache2D cache, ChunkAccess chunk) { -+ su.plo.matter.Globals.setupGlobals(worldGenContext.level()); // Leaf - Matter - Feature Secure Seed ++ su.plo.matter.Globals.setupGlobals(worldGenContext.level()); // Leaf - Matter - Secure Seed if (chunk.getPersistedStatus().isBefore(this.targetStatus)) { ProfiledDuration profiledDuration = JvmProfiler.INSTANCE .onChunkGenerate(chunk.getPos(), worldGenContext.level().dimension(), this.targetStatus.getName()); diff --git a/net/minecraft/world/level/levelgen/WorldOptions.java b/net/minecraft/world/level/levelgen/WorldOptions.java -index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cfd830b926 100644 +index c92508741439a8d0d833ea02d0104416adb83c92..c05da7cfcd3d97a1716cb305be36ba9c94217b6f 100644 --- a/net/minecraft/world/level/levelgen/WorldOptions.java +++ b/net/minecraft/world/level/levelgen/WorldOptions.java @@ -9,8 +9,20 @@ import net.minecraft.util.RandomSource; import org.apache.commons.lang3.StringUtils; public class WorldOptions { -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + private static final com.google.gson.Gson gson = new com.google.gson.Gson(); + private static final boolean isSecureSeedEnabled = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled; public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( @@ -215,14 +214,14 @@ index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cf .apply(instance, instance.stable(WorldOptions::new)) ); - public static final WorldOptions DEMO_OPTIONS = new WorldOptions("North Carolina".hashCode(), true, true); -+ // Leaf end - Matter - Feature Secure Seed -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed ++ // Leaf start - Matter - Secure Seed + public static final WorldOptions DEMO_OPTIONS = isSecureSeedEnabled + ? new WorldOptions((long) "North Carolina".hashCode(), su.plo.matter.Globals.createRandomWorldSeed(), true, true) + : new WorldOptions("North Carolina".hashCode(), true, true); -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed private final long seed; -+ private long[] featureSeed = su.plo.matter.Globals.createRandomWorldSeed(); // Leaf - Matter - Feature Secure Seed ++ private long[] featureSeed = su.plo.matter.Globals.createRandomWorldSeed(); // Leaf - Matter - Secure Seed private final boolean generateStructures; private final boolean generateBonusChest; private final Optional legacyCustomOptions; @@ -230,7 +229,7 @@ index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cf this(seed, generateStructures, generateBonusChest, Optional.empty()); } -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + public WorldOptions(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest) { + this(seed, featureSeed, generateStructures, bonusChest, Optional.empty()); + } @@ -238,27 +237,27 @@ index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cf + private WorldOptions(long seed, String featureSeedJson, boolean generateStructures, boolean bonusChest, Optional legacyCustomOptions) { + this(seed, gson.fromJson(featureSeedJson, long[].class), generateStructures, bonusChest, legacyCustomOptions); + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed + public static WorldOptions defaultWithRandomSeed() { - return new WorldOptions(randomSeed(), true, false); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + return isSecureSeedEnabled + ? new WorldOptions(randomSeed(), su.plo.matter.Globals.createRandomWorldSeed(), true, false) + : new WorldOptions(randomSeed(), true, false); -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed } public static WorldOptions testWorldWithRandomSeed() { return new WorldOptions(randomSeed(), false, false); } -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + private WorldOptions(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest, Optional legacyCustomOptions) { + this(seed, generateStructures, bonusChest, legacyCustomOptions); + this.featureSeed = featureSeed; + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed + private WorldOptions(long seed, boolean generateStructures, boolean generateBonusChest, Optional legacyCustomOptions) { this.seed = seed; @@ -267,15 +266,15 @@ index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cf return this.seed; } -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + public long[] featureSeed() { + return this.featureSeed; + } + -+ public String featureSeedSerialize() { ++ private String featureSeedSerialize() { + return gson.toJson(this.featureSeed); + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed + public boolean generateStructures() { return this.generateStructures; @@ -284,7 +283,7 @@ index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cf return this.legacyCustomOptions.isPresent(); } -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed public WorldOptions withBonusChest(boolean generateBonusChest) { - return new WorldOptions(this.seed, this.generateStructures, generateBonusChest, this.legacyCustomOptions); + return isSecureSeedEnabled @@ -305,12 +304,12 @@ index c92508741439a8d0d833ea02d0104416adb83c92..782769443515fa084c51f2f6a3c711cf + ? new WorldOptions(seed.orElse(randomSeed()), su.plo.matter.Globals.createRandomWorldSeed(), this.generateStructures, this.generateBonusChest, this.legacyCustomOptions) + : new WorldOptions(seed.orElse(randomSeed()), this.generateStructures, this.generateBonusChest, this.legacyCustomOptions); } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed public static OptionalLong parseSeed(String seed) { seed = seed.trim(); diff --git a/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/net/minecraft/world/level/levelgen/feature/GeodeFeature.java -index 38475f6975533909924c8d54f438cf43cdfe31a3..e416b27c7f6604349766d44284ee004d5f62d9b2 100644 +index 38475f6975533909924c8d54f438cf43cdfe31a3..f73bd2d86b2fcffa55cd8cc82aa1febe3467c87a 100644 --- a/net/minecraft/world/level/levelgen/feature/GeodeFeature.java +++ b/net/minecraft/world/level/levelgen/feature/GeodeFeature.java @@ -41,7 +41,11 @@ public class GeodeFeature extends Feature { @@ -318,83 +317,77 @@ index 38475f6975533909924c8d54f438cf43cdfe31a3..e416b27c7f6604349766d44284ee004d List> list = Lists.newLinkedList(); int i2 = geodeConfiguration.distributionPoints.sample(randomSource); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed())); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled + ? new su.plo.matter.WorldgenCryptoRandom(0, 0, su.plo.matter.Globals.Salt.GEODE_FEATURE, 0) + : new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed())); -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed NormalNoise normalNoise = NormalNoise.create(worldgenRandom, -4, 1.0); List list1 = Lists.newLinkedList(); double d = (double)i2 / geodeConfiguration.outerWallDistance.getMaxValue(); diff --git a/net/minecraft/world/level/levelgen/structure/Structure.java b/net/minecraft/world/level/levelgen/structure/Structure.java -index 8328e864c72b7a358d6bb1f33459b8c4df2ecb1a..533dc888e4c1febe4e4b71bd6e1c1affbeb492a9 100644 +index 8328e864c72b7a358d6bb1f33459b8c4df2ecb1a..28281491be6b54de18c49ff0d52e302575d3ad38 100644 --- a/net/minecraft/world/level/levelgen/structure/Structure.java +++ b/net/minecraft/world/level/levelgen/structure/Structure.java -@@ -249,6 +249,13 @@ public abstract class Structure { +@@ -249,6 +249,11 @@ public abstract class Structure { } private static WorldgenRandom makeRandom(long seed, ChunkPos chunkPos) { -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { -+ return new su.plo.matter.WorldgenCryptoRandom( -+ chunkPos.x, chunkPos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, seed -+ ); ++ return new su.plo.matter.WorldgenCryptoRandom(chunkPos.x, chunkPos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, seed); + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); worldgenRandom.setLargeFeatureSeed(seed, chunkPos.x, chunkPos.z); return worldgenRandom; diff --git a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java -index ee0d9dddb36b6879fa113299e24f1aa3b2b151cc..d7040165f2b5bb8c60bf32c7bd57ddc0b49faec8 100644 +index ee0d9dddb36b6879fa113299e24f1aa3b2b151cc..6584c9320361dbbdea1899ab9e43b444de5006a6 100644 --- a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java +++ b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java -@@ -67,8 +67,17 @@ public class RandomSpreadStructurePlacement extends StructurePlacement { +@@ -67,8 +67,15 @@ public class RandomSpreadStructurePlacement extends StructurePlacement { public ChunkPos getPotentialStructureChunk(long seed, int regionX, int regionZ) { int i = Math.floorDiv(regionX, this.spacing); int i1 = Math.floorDiv(regionZ, this.spacing); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureWithSalt(seed, i, i1, this.salt()); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom; + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { -+ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom( -+ i, i1, su.plo.matter.Globals.Salt.POTENTIONAL_FEATURE, this.salt -+ ); ++ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(i, i1, su.plo.matter.Globals.Salt.POTENTIONAL_FEATURE, this.salt); + } else { + worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + worldgenRandom.setLargeFeatureWithSalt(seed, i, i1, this.salt()); + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed int i2 = this.spacing - this.separation; int i3 = this.spreadType.evaluate(worldgenRandom, i2); int i4 = this.spreadType.evaluate(worldgenRandom, i2); diff --git a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java -index 670335a7bbfbc9da64c389977498c22dfcd03251..03247c55e0448cabc24ff281e2d1c7df527161da 100644 +index 670335a7bbfbc9da64c389977498c22dfcd03251..aaf80406af22af288b1b2e36a7a5d00c26c5afa5 100644 --- a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java +++ b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java -@@ -118,8 +118,18 @@ public abstract class StructurePlacement { +@@ -118,8 +118,16 @@ public abstract class StructurePlacement { public abstract StructurePlacementType type(); private static boolean probabilityReducer(long levelSeed, int regionX, int regionZ, int salt, float probability, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs; ignore here - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureWithSalt(levelSeed, regionX, regionZ, salt); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom; + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { -+ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom( -+ regionX, regionZ, su.plo.matter.Globals.Salt.UNDEFINED, salt -+ ); ++ worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(regionX, regionZ, su.plo.matter.Globals.Salt.UNDEFINED, salt); + } else { + worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + worldgenRandom.setLargeFeatureWithSalt(levelSeed, salt, regionX, regionZ); + } -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed + return worldgenRandom.nextFloat() < probability; } diff --git a/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java b/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java -index eb85edaa3b7fab4f11545b0fa8bfea882dedb67d..4633408a710f6e3a9a6545f181ee37f305daa0e4 100644 +index eb85edaa3b7fab4f11545b0fa8bfea882dedb67d..4a5012400cd23590bd8e64670222995a200c93ea 100644 --- a/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java +++ b/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java @@ -64,7 +64,11 @@ public class JigsawPlacement { @@ -402,35 +395,35 @@ index eb85edaa3b7fab4f11545b0fa8bfea882dedb67d..4633408a710f6e3a9a6545f181ee37f3 StructureTemplateManager structureTemplateManager = context.structureTemplateManager(); LevelHeightAccessor levelHeightAccessor = context.heightAccessor(); - WorldgenRandom worldgenRandom = context.random(); -+ // Leaf start - Matter - Feature Secure Seed ++ // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled + ? new su.plo.matter.WorldgenCryptoRandom(context.chunkPos().x, context.chunkPos().z, su.plo.matter.Globals.Salt.JIGSAW_PLACEMENT, 0) + : context.random(); -+ // Leaf end - Matter - Feature Secure Seed ++ // Leaf end - Matter - Secure Seed Registry registry = registryAccess.lookupOrThrow(Registries.TEMPLATE_POOL); Rotation random = Rotation.getRandom(worldgenRandom); StructureTemplatePool structureTemplatePool = startPool.unwrapKey() diff --git a/net/minecraft/world/level/levelgen/structure/structures/EndCityStructure.java b/net/minecraft/world/level/levelgen/structure/structures/EndCityStructure.java -index 653c03d214d2e690852adc4d697e2b24c39ea3d0..81b9f0a07cc2b06770c23f04de5d087c041bd9da 100644 +index 653c03d214d2e690852adc4d697e2b24c39ea3d0..807881ab3b647bff515df627543b8a2e1cad3c3f 100644 --- a/net/minecraft/world/level/levelgen/structure/structures/EndCityStructure.java +++ b/net/minecraft/world/level/levelgen/structure/structures/EndCityStructure.java @@ -10,6 +10,7 @@ import net.minecraft.world.level.levelgen.structure.Structure; import net.minecraft.world.level.levelgen.structure.StructurePiece; import net.minecraft.world.level.levelgen.structure.StructureType; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; -+//import su.plo.matter.WorldgenCryptoRandom; // Leaf - Matter - Feature Secure Seed ++//import su.plo.matter.WorldgenCryptoRandom; // Leaf - Matter - Secure Seed public class EndCityStructure extends Structure { public static final MapCodec CODEC = simpleCodec(EndCityStructure::new); diff --git a/net/minecraft/world/level/levelgen/structure/structures/MineshaftStructure.java b/net/minecraft/world/level/levelgen/structure/structures/MineshaftStructure.java -index 5f2118f664c1013b99137c6d34a11c40c2559156..9f80eff88f540e54eb792cc2899cfcb7d75ca0ff 100644 +index 5f2118f664c1013b99137c6d34a11c40c2559156..2acee0e8b5b80f7a40346befcafcd011edd37cf9 100644 --- a/net/minecraft/world/level/levelgen/structure/structures/MineshaftStructure.java +++ b/net/minecraft/world/level/levelgen/structure/structures/MineshaftStructure.java @@ -20,6 +20,7 @@ import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.structure.Structure; import net.minecraft.world.level.levelgen.structure.StructureType; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; -+//import su.plo.matter.WorldgenCryptoRandom; // Leaf - Matter - Feature Secure Seed ++//import su.plo.matter.WorldgenCryptoRandom; // Leaf - Matter - Secure Seed public class MineshaftStructure extends Structure { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( diff --git a/leaf-server/minecraft-patches/features/0050-Matter-Seed-Command.patch b/leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch similarity index 83% rename from leaf-server/minecraft-patches/features/0050-Matter-Seed-Command.patch rename to leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch index 69c044bd..e612d244 100644 --- a/leaf-server/minecraft-patches/features/0050-Matter-Seed-Command.patch +++ b/leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch @@ -1,13 +1,13 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Apehum Date: Thu, 16 Dec 2021 04:23:40 +0800 -Subject: [PATCH] Matter: Seed Command +Subject: [PATCH] Matter: Secure Seed command Original license: GPLv3 Original project: https://github.com/plasmoapp/matter diff --git a/net/minecraft/server/commands/SeedCommand.java b/net/minecraft/server/commands/SeedCommand.java -index a65affc41a4fc299bc2281f0f53f2e075633899d..d67afc17ccaa01a32aa4d810739cc4161e4bede6 100644 +index a65affc41a4fc299bc2281f0f53f2e075633899d..18dd6fa908104ea9fbb32faaca0725d4d6849b09 100644 --- a/net/minecraft/server/commands/SeedCommand.java +++ b/net/minecraft/server/commands/SeedCommand.java @@ -12,6 +12,17 @@ public class SeedCommand { @@ -15,7 +15,7 @@ index a65affc41a4fc299bc2281f0f53f2e075633899d..d67afc17ccaa01a32aa4d810739cc416 Component component = ComponentUtils.copyOnClickText(String.valueOf(seed)); context.getSource().sendSuccess(() -> Component.translatable("commands.seed.success", component), false); + -+ // Leaf start - Matter - SecureSeed Command ++ // Leaf start - Matter - Secure Seed command + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { + su.plo.matter.Globals.setupGlobals(context.getSource().getLevel()); + String seedStr = su.plo.matter.Globals.seedToString(su.plo.matter.Globals.worldSeed); @@ -23,7 +23,7 @@ index a65affc41a4fc299bc2281f0f53f2e075633899d..d67afc17ccaa01a32aa4d810739cc416 + + context.getSource().sendSuccess(() -> Component.translatable(("Feature seed: %s"), featureSeedComponent), false); + } -+ // Leaf end - Matter - SecureSeed Command ++ // Leaf end - Matter - Secure Seed command + return (int)seed; })); diff --git a/leaf-server/minecraft-patches/features/0051-Faster-Random-Generator.patch b/leaf-server/minecraft-patches/features/0051-Faster-random-generator.patch similarity index 92% rename from leaf-server/minecraft-patches/features/0051-Faster-Random-Generator.patch rename to leaf-server/minecraft-patches/features/0051-Faster-random-generator.patch index c1af87c1..bc2f4ea7 100644 --- a/leaf-server/minecraft-patches/features/0051-Faster-Random-Generator.patch +++ b/leaf-server/minecraft-patches/features/0051-Faster-random-generator.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Tue, 9 Nov 2077 00:00:00 +0800 -Subject: [PATCH] Faster Random Generator +Subject: [PATCH] Faster random generator This patch replaces LegacyRandomSource with FasterRandomSource by default, which is faster in general. @@ -14,7 +14,7 @@ ThreadUnsafeRandom (Moonrise): 102,265,100 ns SimpleThreadUnsafeRandom (Moonrise): 97,054,600 ns diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java -index 6f14f321d2fa83abab0aa1b262ff873b208a67be..5d9c3054e32636b051cc6b210c71bb722c1de1c8 100644 +index 92e70e132a86930d9cd0db32f10e106427621c7d..5b61e9e26fd63b938f38753c9ce38a474ffe80e5 100644 --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java @@ -150,7 +150,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon @@ -27,7 +27,7 @@ index 6f14f321d2fa83abab0aa1b262ff873b208a67be..5d9c3054e32636b051cc6b210c71bb72 final ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkData chunkData = ((ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemChunkHolder)((ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemLevelChunk)levelChunk).moonrise$getChunkAndHolder().holder()) .moonrise$getRealChunkHolder().holderData; diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index b3c388f6108360708baf275121af18f46622494f..84d3df4008e56d8ceba2b422f42c34295c5e0a83 100644 +index 22b929d30938a26837b21511425c62fc1665a669..677e5f31089879235677b82ff554e5b89e335a6d 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -902,7 +902,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -146,7 +146,7 @@ index f44461f92a10cbfdb8fcdbc3a2442e526b9d3d33..b4c5eea26e87ee6f466c53a6dd086790 public final Biome.ClimateSettings climateSettings; private final BiomeGenerationSettings generationSettings; diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java -index 2b19e989b4475e905d77bf9d47403c724b81fccd..472105a1e392f2e1b080483f3038de4f303919ce 100644 +index 8a4ce8b3b050ad9fb7de007129f5f460110d0b09..176adfcaa0fc458043d4bc05ead1861864b63606 100644 --- a/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -458,7 +458,7 @@ public abstract class ChunkGenerator { @@ -158,15 +158,15 @@ index 2b19e989b4475e905d77bf9d47403c724b81fccd..472105a1e392f2e1b080483f3038de4f seededrandom.setDecorationSeed(level.getSeed(), x, z); populator.populate(world, new org.bukkit.craftbukkit.util.RandomSourceWrapper.RandomWrapper(seededrandom), x, z, limitedRegion); } -@@ -567,7 +567,7 @@ public abstract class ChunkGenerator { - pos.x, pos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, 0 - ); +@@ -565,7 +565,7 @@ public abstract class ChunkGenerator { + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { + worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(pos.x, pos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, 0); } else { - worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + worldgenRandom = new WorldgenRandom(org.dreeam.leaf.config.modules.opt.FastRNG.worldgenEnabled() ? new org.dreeam.leaf.util.math.random.FasterRandomSource(0L) : new LegacyRandomSource(0L)); // Leaf - Faster random generator worldgenRandom.setLargeFeatureSeed(structureState.getLevelSeed(), pos.x, pos.z); } - // Leaf end - Matter - Feature Secure Seed + // Leaf end - Matter - Secure Seed diff --git a/net/minecraft/world/level/levelgen/DensityFunctions.java b/net/minecraft/world/level/levelgen/DensityFunctions.java index 04527a5c65ad630f794fed9071d485aedd02257a..15fc39f9c77fdd03a0ca4a39d173c851b9454f08 100644 --- a/net/minecraft/world/level/levelgen/DensityFunctions.java @@ -203,7 +203,7 @@ index 65728ef17e63d71833677fdcbd5bb90794b4822b..57ae4aaf1431021daf77c5638038d491 NaturalSpawner.spawnMobsForChunkGeneration(level, biome, center, worldgenRandom); } diff --git a/net/minecraft/world/level/levelgen/WorldgenRandom.java b/net/minecraft/world/level/levelgen/WorldgenRandom.java -index c2d7cd788071e25b8ba2503c30ae80c7a9f353ed..08cf526ae87dd2560fcb50d5786701701e34ec00 100644 +index c2d7cd788071e25b8ba2503c30ae80c7a9f353ed..a22508c50b34ca48328595cc7b69e008bf17d370 100644 --- a/net/minecraft/world/level/levelgen/WorldgenRandom.java +++ b/net/minecraft/world/level/levelgen/WorldgenRandom.java @@ -69,7 +69,7 @@ public class WorldgenRandom extends LegacyRandomSource { @@ -211,21 +211,21 @@ index c2d7cd788071e25b8ba2503c30ae80c7a9f353ed..08cf526ae87dd2560fcb50d578670170 public static RandomSource seedSlimeChunk(int chunkX, int chunkZ, long levelSeed, long salt) { - return RandomSource.create(levelSeed + chunkX * chunkX * 4987142 + chunkX * 5947611 + chunkZ * chunkZ * 4392871L + chunkZ * 389711 ^ salt); -+ return RandomSource.createForSlimeChunk(levelSeed + chunkX * chunkX * 4987142 + chunkX * 5947611 + chunkZ * chunkZ * 4392871L + chunkZ * 389711 ^ salt); // Leaf - Faster RNG ++ return RandomSource.createForSlimeChunk(levelSeed + chunkX * chunkX * 4987142 + chunkX * 5947611 + chunkZ * chunkZ * 4392871L + chunkZ * 389711 ^ salt); // Leaf - Faster random generator } public static enum Algorithm { diff --git a/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/net/minecraft/world/level/levelgen/feature/GeodeFeature.java -index e416b27c7f6604349766d44284ee004d5f62d9b2..1d27550bb5f29b6bfe8e0ad4fc4c9d39a9d7b29e 100644 +index f73bd2d86b2fcffa55cd8cc82aa1febe3467c87a..0ebdc328a6884ab5898681c7d74714bd137d1351 100644 --- a/net/minecraft/world/level/levelgen/feature/GeodeFeature.java +++ b/net/minecraft/world/level/levelgen/feature/GeodeFeature.java @@ -44,7 +44,7 @@ public class GeodeFeature extends Feature { - // Leaf start - Matter - Feature Secure Seed + // Leaf start - Matter - Secure Seed WorldgenRandom worldgenRandom = org.dreeam.leaf.config.modules.misc.SecureSeed.enabled ? new su.plo.matter.WorldgenCryptoRandom(0, 0, su.plo.matter.Globals.Salt.GEODE_FEATURE, 0) - : new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed())); + : new WorldgenRandom(org.dreeam.leaf.config.modules.opt.FastRNG.worldgenEnabled() ? new org.dreeam.leaf.util.math.random.FasterRandomSource(worldGenLevel.getSeed()) : new LegacyRandomSource(worldGenLevel.getSeed())); // Leaf - Faster random generator - // Leaf end - Matter - Feature Secure Seed + // Leaf end - Matter - Secure Seed NormalNoise normalNoise = NormalNoise.create(worldgenRandom, -4, 1.0); List list1 = Lists.newLinkedList(); diff --git a/net/minecraft/world/level/levelgen/feature/stateproviders/DualNoiseProvider.java b/net/minecraft/world/level/levelgen/feature/stateproviders/DualNoiseProvider.java @@ -255,45 +255,45 @@ index f685372a39976f823202f2d9015c14f835b94a0c..bdd1b4ab758fc653df4adad7633ef430 protected double getNoiseValue(BlockPos pos, double delta) { diff --git a/net/minecraft/world/level/levelgen/structure/Structure.java b/net/minecraft/world/level/levelgen/structure/Structure.java -index 533dc888e4c1febe4e4b71bd6e1c1affbeb492a9..7f8293497912532fd6b83a0962a722b0e6267721 100644 +index 28281491be6b54de18c49ff0d52e302575d3ad38..3aa35d67df8f9118c944cebfcb675cccd9d99be2 100644 --- a/net/minecraft/world/level/levelgen/structure/Structure.java +++ b/net/minecraft/world/level/levelgen/structure/Structure.java -@@ -256,7 +256,7 @@ public abstract class Structure { - ); +@@ -254,7 +254,7 @@ public abstract class Structure { + return new su.plo.matter.WorldgenCryptoRandom(chunkPos.x, chunkPos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, seed); } - // Leaf end - Matter - Feature Secure Seed + // Leaf end - Matter - Secure Seed - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + WorldgenRandom worldgenRandom = new WorldgenRandom(org.dreeam.leaf.config.modules.opt.FastRNG.worldgenEnabled() ? new org.dreeam.leaf.util.math.random.FasterRandomSource(0L) : new LegacyRandomSource(0L)); // Leaf - Faster random generator worldgenRandom.setLargeFeatureSeed(seed, chunkPos.x, chunkPos.z); return worldgenRandom; } diff --git a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java -index d7040165f2b5bb8c60bf32c7bd57ddc0b49faec8..ebba2592726356eb837b733c36148f444c2d7f13 100644 +index 6584c9320361dbbdea1899ab9e43b444de5006a6..06083cc7612ef28bcd9264bb21ab0bbbe0837589 100644 --- a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java +++ b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java -@@ -74,7 +74,7 @@ public class RandomSpreadStructurePlacement extends StructurePlacement { - i, i1, su.plo.matter.Globals.Salt.POTENTIONAL_FEATURE, this.salt - ); +@@ -72,7 +72,7 @@ public class RandomSpreadStructurePlacement extends StructurePlacement { + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { + worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(i, i1, su.plo.matter.Globals.Salt.POTENTIONAL_FEATURE, this.salt); } else { - worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + worldgenRandom = new WorldgenRandom(org.dreeam.leaf.config.modules.opt.FastRNG.worldgenEnabled() ? new org.dreeam.leaf.util.math.random.FasterRandomSource(0L) : new LegacyRandomSource(0L)); // Leaf - Faster random generator worldgenRandom.setLargeFeatureWithSalt(seed, i, i1, this.salt()); } - // Leaf end - Matter - Feature Secure Seed + // Leaf end - Matter - Secure Seed diff --git a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java -index 03247c55e0448cabc24ff281e2d1c7df527161da..2a9f66ac0fe8f664d404c68df7414be6b0396082 100644 +index aaf80406af22af288b1b2e36a7a5d00c26c5afa5..c74313a305fffadb85c84d8746e9d338ce55ea80 100644 --- a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java +++ b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java -@@ -125,7 +125,7 @@ public abstract class StructurePlacement { - regionX, regionZ, su.plo.matter.Globals.Salt.UNDEFINED, salt - ); +@@ -123,7 +123,7 @@ public abstract class StructurePlacement { + if (org.dreeam.leaf.config.modules.misc.SecureSeed.enabled) { + worldgenRandom = new su.plo.matter.WorldgenCryptoRandom(regionX, regionZ, su.plo.matter.Globals.Salt.UNDEFINED, salt); } else { - worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); + worldgenRandom = new WorldgenRandom(org.dreeam.leaf.config.modules.opt.FastRNG.worldgenEnabled() ? new org.dreeam.leaf.util.math.random.FasterRandomSource(0L) : new LegacyRandomSource(0L)); // Leaf - Faster random generator worldgenRandom.setLargeFeatureWithSalt(levelSeed, salt, regionX, regionZ); } - // Leaf end - Matter - Feature Secure Seed -@@ -134,7 +134,7 @@ public abstract class StructurePlacement { + // Leaf end - Matter - Secure Seed +@@ -132,7 +132,7 @@ public abstract class StructurePlacement { } private static boolean legacyProbabilityReducerWithDouble(long baseSeed, int salt, int chunkX, int chunkZ, float probability, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs @@ -302,7 +302,7 @@ index 03247c55e0448cabc24ff281e2d1c7df527161da..2a9f66ac0fe8f664d404c68df7414be6 if (saltOverride == null) { // Paper - Add missing structure set seed configs worldgenRandom.setLargeFeatureSeed(baseSeed, chunkX, chunkZ); // Paper start - Add missing structure set seed configs -@@ -146,7 +146,7 @@ public abstract class StructurePlacement { +@@ -144,7 +144,7 @@ public abstract class StructurePlacement { } private static boolean legacyArbitrarySaltProbabilityReducer(long levelSeed, int salt, int regionX, int regionZ, float probability, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs @@ -311,7 +311,7 @@ index 03247c55e0448cabc24ff281e2d1c7df527161da..2a9f66ac0fe8f664d404c68df7414be6 worldgenRandom.setLargeFeatureWithSalt(levelSeed, regionX, regionZ, saltOverride != null ? saltOverride : HIGHLY_ARBITRARY_RANDOM_SALT); // Paper - Add missing structure set seed configs return worldgenRandom.nextFloat() < probability; } -@@ -154,7 +154,7 @@ public abstract class StructurePlacement { +@@ -152,7 +152,7 @@ public abstract class StructurePlacement { private static boolean legacyPillagerOutpostReducer(long levelSeed, int salt, int regionX, int regionZ, float probability, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs; ignore here int i = regionX >> 4; int i1 = regionZ >> 4; diff --git a/leaf-server/minecraft-patches/features/0054-Configurable-connection-message.patch b/leaf-server/minecraft-patches/features/0054-Configurable-connection-message.patch index 09d650eb..79f1d07a 100644 --- a/leaf-server/minecraft-patches/features/0054-Configurable-connection-message.patch +++ b/leaf-server/minecraft-patches/features/0054-Configurable-connection-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection message diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index b98e854fb9fad65b176b4915214a0a4c5e424d6c..5fe6a295f5b5285a20c535a026e1342f89896fd7 100644 +index 6855076ef73bbfd23e75ba4ae8eaa0ea598c9d4e..3847df8a77d5ceece2541f4d459d0f61e3276c86 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -433,7 +433,7 @@ public abstract class PlayerList { @@ -13,7 +13,7 @@ index b98e854fb9fad65b176b4915214a0a4c5e424d6c..5fe6a295f5b5285a20c535a026e1342f player.containerMenu.transferTo(player.containerMenu, bukkitPlayer); - org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, io.papermc.paper.adventure.PaperAdventure.asAdventure(mutableComponent)); // Paper - Adventure -+ org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure ++ org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure // Leaf - Configurable connection message - join message this.cserver.getPluginManager().callEvent(playerJoinEvent); if (!player.connection.isAcceptingMessages()) { @@ -31,11 +31,11 @@ index b98e854fb9fad65b176b4915214a0a4c5e424d6c..5fe6a295f5b5285a20c535a026e1342f } - org.bukkit.event.player.PlayerQuitEvent playerQuitEvent = new org.bukkit.event.player.PlayerQuitEvent(player.getBukkitEntity(), leaveMessage, player.quitReason); // Paper - Adventure & Add API for quit reason -+ org.bukkit.event.player.PlayerQuitEvent playerQuitEvent = new org.bukkit.event.player.PlayerQuitEvent(player.getBukkitEntity(), getQuitMsg(leaveMessage, player.getBukkitEntity()), player.quitReason); // Paper - Adventure & Add API for quit reason ++ org.bukkit.event.player.PlayerQuitEvent playerQuitEvent = new org.bukkit.event.player.PlayerQuitEvent(player.getBukkitEntity(), getQuitMsg(leaveMessage, player.getBukkitEntity()), player.quitReason); // Paper - Adventure & Add API for quit reason // Leaf - Configurable connection message - quit message this.cserver.getPluginManager().callEvent(playerQuitEvent); player.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage()); -@@ -1661,4 +1661,33 @@ public abstract class PlayerList { +@@ -1661,4 +1661,34 @@ public abstract class PlayerList { public boolean isAllowCommandsForAllPlayers() { return this.allowCommandsForAllPlayers; } @@ -48,12 +48,13 @@ index b98e854fb9fad65b176b4915214a0a4c5e424d6c..5fe6a295f5b5285a20c535a026e1342f + } + + return net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.dreeam.leaf.config.modules.misc.ConnectionMessage.joinMessage) -+ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("%player_name%").replacement(craftPlayer.getName()).build()) -+ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("%player_displayname%").replacement(craftPlayer.displayName()).build()); ++ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("").replacement(craftPlayer.getName()).build()) ++ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("").replacement(craftPlayer.displayName()).build()); + } + + return net.kyori.adventure.text.Component.empty(); + } ++ + private net.kyori.adventure.text.Component getQuitMsg(net.kyori.adventure.text.Component defaultJoinMsg, org.bukkit.craftbukkit.entity.CraftPlayer craftPlayer) { + if (org.dreeam.leaf.config.modules.misc.ConnectionMessage.quitEnabled) { + if ("default".equals(org.dreeam.leaf.config.modules.misc.ConnectionMessage.quitMessage)) { @@ -61,8 +62,8 @@ index b98e854fb9fad65b176b4915214a0a4c5e424d6c..5fe6a295f5b5285a20c535a026e1342f + } + + return net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.dreeam.leaf.config.modules.misc.ConnectionMessage.quitMessage) -+ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("%player_name%").replacement(craftPlayer.getName()).build()) -+ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("%player_displayname%").replacement(craftPlayer.displayName()).build()); ++ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("").replacement(craftPlayer.getName()).build()) ++ .replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("").replacement(craftPlayer.displayName()).build()); + } + + return net.kyori.adventure.text.Component.empty(); diff --git a/leaf-server/minecraft-patches/features/0056-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/leaf-server/minecraft-patches/features/0056-Remove-stream-in-BlockBehaviour-cache-blockstate.patch index 4fe7a727..e5a97395 100644 --- a/leaf-server/minecraft-patches/features/0056-Remove-stream-in-BlockBehaviour-cache-blockstate.patch +++ b/leaf-server/minecraft-patches/features/0056-Remove-stream-in-BlockBehaviour-cache-blockstate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove stream in BlockBehaviour cache blockstate diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java -index bf77d02d8fc58b5a16c67a305fe0991ad08a795c..7afaa15102eb625245c2ccb31deeb6d1df658284 100644 +index bf77d02d8fc58b5a16c67a305fe0991ad08a795c..117c7cedb9f355b5139b9aa9b15f4459453e3675 100644 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -1067,8 +1067,14 @@ public abstract class BlockBehaviour implements FeatureElement { @@ -14,14 +14,14 @@ index bf77d02d8fc58b5a16c67a305fe0991ad08a795c..7afaa15102eb625245c2ccb31deeb6d1 } else { - this.largeCollisionShape = Arrays.stream(Direction.Axis.values()) - .anyMatch(dir -> this.collisionShape.min(dir) < 0.0 || this.collisionShape.max(dir) > 1.0); -+ // Leaf start - Remove stream ++ // Leaf start - Remove stream in BlockBehaviour cache blockstate + for (Direction.Axis axis : Direction.Axis.values()) { + if (this.collisionShape.min(axis) < 0.0 || this.collisionShape.max(axis) > 1.0) { + this.largeCollisionShape = true; + break; + } + } -+ // Leaf end - Remove stream ++ // Leaf end - Remove stream in BlockBehaviour cache blockstate this.faceSturdy = new boolean[DIRECTIONS.length * SUPPORT_TYPE_COUNT]; for (Direction direction : DIRECTIONS) { diff --git a/leaf-server/minecraft-patches/features/0061-Remove-stream-in-BehaviorUtils.patch b/leaf-server/minecraft-patches/features/0061-Remove-stream-in-BehaviorUtils.patch index 73940100..057afb54 100644 --- a/leaf-server/minecraft-patches/features/0061-Remove-stream-in-BehaviorUtils.patch +++ b/leaf-server/minecraft-patches/features/0061-Remove-stream-in-BehaviorUtils.patch @@ -3,7 +3,7 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:56:24 +0800 Subject: [PATCH] Remove stream in BehaviorUtils -Dreeam TODO: Check this +Dreeam TODO: Check this, `SectionPos.cube(sectionPos, radius).toList()` diff --git a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java index 800bc29502ed46bd77cb04c0a79143898f109a48..77fa472d970c0f187f228b06e0b459ebdcaeb7fd 100644 diff --git a/leaf-server/minecraft-patches/features/0087-Cache-blockstate-cache.patch b/leaf-server/minecraft-patches/features/0087-Cache-blockstate-cache.patch index 28311894..2652d71d 100644 --- a/leaf-server/minecraft-patches/features/0087-Cache-blockstate-cache.patch +++ b/leaf-server/minecraft-patches/features/0087-Cache-blockstate-cache.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache blockstate cache diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java -index 7afaa15102eb625245c2ccb31deeb6d1df658284..35d95d5c2a61533d3588c45db8acdcb11f6e53e3 100644 +index 117c7cedb9f355b5139b9aa9b15f4459453e3675..7f46f33fa565fa1a3aedce5524f19be8ba420352 100644 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -1050,6 +1050,10 @@ public abstract class BlockBehaviour implements FeatureElement { @@ -22,7 +22,7 @@ index 7afaa15102eb625245c2ccb31deeb6d1df658284..35d95d5c2a61533d3588c45db8acdcb1 @@ -1068,7 +1072,7 @@ public abstract class BlockBehaviour implements FeatureElement { ); } else { - // Leaf start - Remove stream + // Leaf start - Remove stream in BlockBehaviour cache blockstate - for (Direction.Axis axis : Direction.Axis.values()) { + for (Direction.Axis axis : DIRECTION_AXIS_VALUES) { // Leaf - Cache blockstate cache array if (this.collisionShape.min(axis) < 0.0 || this.collisionShape.max(axis) > 1.0) { diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java index 72782ef6..91a8dc90 100644 --- a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/ConnectionMessage.java @@ -37,5 +37,14 @@ public class ConnectionMessage extends ConfigModules { quitMessage = config.getString(getBasePath() + ".quit.message", quitMessage, config.pickStringRegionBased( "Quit message of player", "玩家退出服务器时的消息")); + + // Legacy compatibility + // TODO: config migration + joinMessage = joinMessage + .replace("%player_name%", "") + .replace("%player_displayname%", ""); + quitMessage = quitMessage + .replace("%player_name%", "") + .replace("%player_displayname%", ""); } }