From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 28 Jan 2025 18:56:53 +0800 Subject: [PATCH] Leaf: Secure seed and matter seed command Co-authored by: Apehum As part of: Leaf (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/paper-patches/features/0019-Matter-Secure-Seed.patch and https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/leaf-server/minecraft-patches/features/0050-Matter-Secure-Seed-command.patch) Licensed under: GPL-3.0 (https://github.com/Winds-Studio/Leaf/blob/7f3e240bbe0970683c40279a7a65f0fde47503b6/licenses/GPL-3.0.txt) diff --git a/net/minecraft/server/commands/SeedCommand.java b/net/minecraft/server/commands/SeedCommand.java index 7c1e18d8362be5ae885c32b05e98b9ef45942d93..ae2a52193eb87467c31ed79b95e15d9b50f56076 100644 --- a/net/minecraft/server/commands/SeedCommand.java +++ b/net/minecraft/server/commands/SeedCommand.java @@ -12,6 +12,16 @@ public class SeedCommand { long seed = commandContext.getSource().getLevel().getSeed(); Component component = ComponentUtils.copyOnClickText(String.valueOf(seed)); commandContext.getSource().sendSuccess(() -> Component.translatable("commands.seed.success", component), false); + // Leaf start - Matter - SecureSeed Command + if (me.earthme.luminol.config.modules.function.SecureSeedConfig.enabled) { + su.plo.matter.Globals.setupGlobals(commandContext.getSource().getLevel()); + String seedStr = su.plo.matter.Globals.seedToString(su.plo.matter.Globals.worldSeed); + Component featureSeedComponent = ComponentUtils.copyOnClickText(seedStr); + + commandContext.getSource().sendSuccess(() -> Component.translatable(("Feature seed: %s"), featureSeedComponent), false); + } + // Leaf end - Matter - SecureSeed Command + return (int)seed; })); } diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java index 4a01088da91fc6d620cb804a9ab6d6eb1630b473..2affc83e3e449776e7983919d7d6878ae6e9b3a9 100644 --- a/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java @@ -115,7 +115,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 250d09fe3c49d1d0cbfde0fc06abd16fe329f9ed..05bad0366bd36b8134290a0cceb4d4dfcbbd0544 100644 --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java @@ -674,6 +674,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon } public ChunkGenerator getGenerator() { + 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 00482efc8e736e73ad136105ad7b9dd2cafd581f..55f3497503e3317d765abb0bd4a9a620f63cd240 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -567,6 +567,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 - 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 7b9105cc38380d60892647e52608787dbde28f0d..4686846d3841e3b294c488f8ab8329e4e901c866 100644 --- a/net/minecraft/world/entity/monster/Slime.java +++ b/net/minecraft/world/entity/monster/Slime.java @@ -329,7 +329,12 @@ public class Slime extends Mob implements Enemy { } 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; // Paper + // Leaf start - Matter - Secure Seed + boolean isSlimeChunk = me.earthme.luminol.config.modules.function.SecureSeedConfig.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 - 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 182c14b660f8860bed627eed4e01fd4002153e9a..686c031ec73acc80683aaa39a78fe9221f0215a6 100644 --- a/net/minecraft/world/level/chunk/ChunkAccess.java +++ b/net/minecraft/world/level/chunk/ChunkAccess.java @@ -88,6 +88,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 - Secure Seed + private boolean slimeChunk; + private boolean hasComputedSlimeChunk; + // Leaf end - Matter - Secure Seed // Paper start - rewrite chunk system private volatile ca.spottedleaf.moonrise.patches.starlight.light.SWMRNibbleArray[] blockNibbles; @@ -192,6 +196,17 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh return GameEventListenerRegistry.NOOP; } + // Leaf start - Matter - Secure Seed + public boolean isSlimeChunk() { + if (!hasComputedSlimeChunk) { + hasComputedSlimeChunk = true; + slimeChunk = su.plo.matter.WorldgenCryptoRandom.seedSlimeChunk(chunkPos.x, chunkPos.z).nextInt(10) == 0; + } + + return slimeChunk; + } + // Leaf end - Matter - Secure Seed + public abstract BlockState getBlockState(final int x, final int y, final int z); // Paper @Nullable diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java index 92d13f9b886114553b471271391255ba08c8108f..5e517d36bb5f16bcd1cbab97d749b2c18cef9df8 100644 --- a/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -342,7 +342,11 @@ public abstract class ChunkGenerator { Registry registry = level.registryAccess().lookupOrThrow(Registries.STRUCTURE); 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 - Secure Seed + WorldgenRandom worldgenRandom = me.earthme.luminol.config.modules.function.SecureSeedConfig.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 - Secure Seed long l = worldgenRandom.setDecorationSeed(level.getSeed(), blockPos.getX(), blockPos.getZ()); Set> set = new ObjectArraySet<>(); ChunkPos.rangeClosed(sectionPos.chunk(), 1).forEach(chunkPos -> { @@ -551,8 +555,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 - Secure Seed + WorldgenRandom worldgenRandom; + if (me.earthme.luminol.config.modules.function.SecureSeedConfig.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.setLargeFeatureSeed(structureState.getLevelSeed(), pos.x, pos.z); + } + // 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 619b98e42e254c0c260c171a26a2472ddf59b885..22bcf554daa3686f955ac2a5809d8ebd1e1f38eb 100644 --- a/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java +++ b/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java @@ -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 - Secure Seed + RandomSource randomSource = me.earthme.luminol.config.modules.function.SecureSeedConfig.enabled + ? new su.plo.matter.WorldgenCryptoRandom(0, 0, su.plo.matter.Globals.Salt.STRONGHOLDS, 0) + : RandomSource.create(); + // Leaf end - Matter - Secure Seed + if (!me.earthme.luminol.config.modules.function.SecureSeedConfig.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 +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 - 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..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 - 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..cb5269b8e7b2df67d5e78f8313f6fbc14cd1e39e 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 - Secure Seed + private static final com.google.gson.Gson gson = new com.google.gson.Gson(); + private static final boolean isSecureSeedEnabled = me.earthme.luminol.config.modules.function.SecureSeedConfig.enabled; public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( - instance -> instance.group( + instance -> isSecureSeedEnabled + ? instance.group( + Codec.LONG.fieldOf("seed").stable().forGetter(WorldOptions::seed), + Codec.STRING.fieldOf("feature_seed").orElse(gson.toJson(su.plo.matter.Globals.createRandomWorldSeed())).stable().forGetter(WorldOptions::featureSeedSerialize), + Codec.BOOL.fieldOf("generate_features").orElse(true).stable().forGetter(WorldOptions::generateStructures), + Codec.BOOL.fieldOf("bonus_chest").orElse(false).stable().forGetter(WorldOptions::generateBonusChest), + Codec.STRING.lenientOptionalFieldOf("legacy_custom_options").stable().forGetter(worldOptions -> worldOptions.legacyCustomOptions) + ) + .apply(instance, instance.stable(WorldOptions::new)) + : instance.group( Codec.LONG.fieldOf("seed").stable().forGetter(WorldOptions::seed), Codec.BOOL.fieldOf("generate_features").orElse(true).stable().forGetter(WorldOptions::generateStructures), Codec.BOOL.fieldOf("bonus_chest").orElse(false).stable().forGetter(WorldOptions::generateBonusChest), @@ -18,8 +30,14 @@ public class WorldOptions { ) .apply(instance, instance.stable(WorldOptions::new)) ); - public static final WorldOptions DEMO_OPTIONS = new WorldOptions("North Carolina".hashCode(), true, true); + // 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 - Secure Seed private final long 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; @@ -28,14 +46,35 @@ public class WorldOptions { this(seed, generateStructures, generateBonusChest, Optional.empty()); } + // Leaf start - Matter - Secure Seed + public WorldOptions(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest) { + this(seed, featureSeed, generateStructures, bonusChest, Optional.empty()); + } + + 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 - Secure Seed + public static WorldOptions defaultWithRandomSeed() { - return new WorldOptions(randomSeed(), true, false); + // 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 - Secure Seed } public static WorldOptions testWorldWithRandomSeed() { return new WorldOptions(randomSeed(), false, false); } + // 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 - Secure Seed + private WorldOptions(long seed, boolean generateStructures, boolean generateBonusChest, Optional legacyCustomOptions) { this.seed = seed; this.generateStructures = generateStructures; @@ -47,6 +86,16 @@ public class WorldOptions { return this.seed; } + // Leaf start - Matter - Secure Seed + public long[] featureSeed() { + return this.featureSeed; + } + + private String featureSeedSerialize() { + return gson.toJson(this.featureSeed); + } + // Leaf end - Matter - Secure Seed + public boolean generateStructures() { return this.generateStructures; } @@ -59,17 +108,25 @@ public class WorldOptions { return this.legacyCustomOptions.isPresent(); } + // Leaf start - Matter - Secure Seed public WorldOptions withBonusChest(boolean generateBonusChest) { - return new WorldOptions(this.seed, this.generateStructures, generateBonusChest, this.legacyCustomOptions); + return isSecureSeedEnabled + ? new WorldOptions(this.seed, this.featureSeed, this.generateStructures, generateBonusChest, this.legacyCustomOptions) + : new WorldOptions(this.seed, this.generateStructures, generateBonusChest, this.legacyCustomOptions); } public WorldOptions withStructures(boolean generateStructures) { - return new WorldOptions(this.seed, generateStructures, this.generateBonusChest, this.legacyCustomOptions); + return isSecureSeedEnabled + ? new WorldOptions(this.seed, this.featureSeed, generateStructures, this.generateBonusChest, this.legacyCustomOptions) + : new WorldOptions(this.seed, generateStructures, this.generateBonusChest, this.legacyCustomOptions); } public WorldOptions withSeed(OptionalLong seed) { - return new WorldOptions(seed.orElse(randomSeed()), this.generateStructures, this.generateBonusChest, this.legacyCustomOptions); + return isSecureSeedEnabled + ? 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 - 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 4e72eb49dbf4c70ae7556ba6eb210fcd5ef36aaa..c0919291c6f4923c42f662814bfa938b4206eeeb 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 { int i1 = geodeConfiguration.maxGenOffset; List> list = Lists.newLinkedList(); int i2 = geodeConfiguration.distributionPoints.sample(randomSource); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed())); + // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom = me.earthme.luminol.config.modules.function.SecureSeedConfig.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 - 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..a89574d48fa4a3f91655952ba1cd7224fc3057ce 100644 --- a/net/minecraft/world/level/levelgen/structure/Structure.java +++ b/net/minecraft/world/level/levelgen/structure/Structure.java @@ -249,6 +249,11 @@ public abstract class Structure { } private static WorldgenRandom makeRandom(long seed, ChunkPos chunkPos) { + // Leaf start - Matter - Secure Seed + if (me.earthme.luminol.config.modules.function.SecureSeedConfig.enabled) { + return new su.plo.matter.WorldgenCryptoRandom(chunkPos.x, chunkPos.z, su.plo.matter.Globals.Salt.GENERATE_FEATURE, 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..91b2fcb3e35369bbc99733acce5c7bf6d2140ae8 100644 --- a/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java +++ b/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java @@ -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 - Secure Seed + WorldgenRandom worldgenRandom; + if (me.earthme.luminol.config.modules.function.SecureSeedConfig.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.setLargeFeatureWithSalt(seed, i, i1, this.salt()); + } + // 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 f2eb0572b9d97d97bc847082461515a852310dfc..5bdc23cd8d9e9b8b3872553ccc35be3b16f81c07 100644 --- a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java +++ b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java @@ -119,8 +119,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 - Secure Seed + WorldgenRandom worldgenRandom; + if (me.earthme.luminol.config.modules.function.SecureSeedConfig.enabled) { + 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 - 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 1cfa0fcd28685736fcdce4aef817e4d4cc4061cb..0054a26f7c6c94214730f2b46e20c3192e4a0e76 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 { ChunkGenerator chunkGenerator = context.chunkGenerator(); StructureTemplateManager structureTemplateManager = context.structureTemplateManager(); LevelHeightAccessor levelHeightAccessor = context.heightAccessor(); - WorldgenRandom worldgenRandom = context.random(); + // Leaf start - Matter - Secure Seed + WorldgenRandom worldgenRandom = me.earthme.luminol.config.modules.function.SecureSeedConfig.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 - Secure Seed Registry registry = registryAccess.lookupOrThrow(Registries.TEMPLATE_POOL); Rotation random = Rotation.getRandom(worldgenRandom); StructureTemplatePool structureTemplatePool = startPool.unwrapKey()