diff --git a/patches/server/0205-Structure-seed-options.patch b/patches/server/0205-Structure-seed-options.patch index 7eccd95a1..ce25f3d1f 100644 --- a/patches/server/0205-Structure-seed-options.patch +++ b/patches/server/0205-Structure-seed-options.patch @@ -5,35 +5,54 @@ Subject: [PATCH] Structure seed options diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..fe0f14b363f4e6b583cd079f2cf627605731f764 100644 +index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..b2c93ce627cf0a50b4b0a60d2d4206e6c6904e0a 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -580,6 +580,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { - case "village": - seed = conf.villageSeed; - break; -+ // Purpur start -+ case "stronghold": -+ if (org.purpurmc.purpur.PurpurConfig.seedStructureStronghold != -1) { -+ seed = org.purpurmc.purpur.PurpurConfig.seedStructureStronghold; -+ } -+ break; -+ case "mineshaft": -+ if (org.purpurmc.purpur.PurpurConfig.seedStructureMineshaft != -1) { -+ seed = org.purpurmc.purpur.PurpurConfig.seedStructureMineshaft; -+ } -+ break; -+ case "buried_treasure": -+ if (org.purpurmc.purpur.PurpurConfig.seedStructureBuriedTreasure != -1) { -+ seed = org.purpurmc.purpur.PurpurConfig.seedStructureBuriedTreasure; -+ } -+ break; -+ // Purpur end - } +@@ -87,7 +87,10 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { + this.biomeSource = populationSource; + this.runtimeBiomeSource = biomeSource; + this.settings = structuresConfig; +- this.strongholdSeed = worldSeed; ++ // Purpur start ++ int salt = org.purpurmc.purpur.PurpurConfig.seedStructureStronghold; ++ this.strongholdSeed = worldSeed + (salt != -1 ? salt : 0); ++ // Purpur end + } - updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed)); + private void generateStrongholds() { +diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java +index c4ec2e41314da9501dc62baa024607b2782d2c73..54341db6faf66c8e84156ee3a310fd0d6561b632 100644 +--- a/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java ++++ b/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java +@@ -21,7 +21,10 @@ public class BuriedTreasureFeature extends StructureFeature context) { + WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); +- worldgenRandom.setLargeFeatureWithSalt(context.seed(), context.chunkPos().x, context.chunkPos().z, 10387320); ++ // Purpur start ++ int salt = org.purpurmc.purpur.PurpurConfig.seedStructureBuriedTreasure; ++ worldgenRandom.setLargeFeatureWithSalt(context.seed(), context.chunkPos().x, context.chunkPos().z, salt != -1 ? salt : RANDOM_SALT); ++ // Purpur end + return worldgenRandom.nextFloat() < (context.config()).probability && context.validBiomeOnTop(Heightmap.Types.OCEAN_FLOOR_WG); + } + +diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java +index 45f11284bf65081b3b2e8da85114efbe5efd5b42..354a923350cbfc76645136858e8e96285de139a1 100644 +--- a/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java ++++ b/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java +@@ -27,6 +27,10 @@ public class MineshaftFeature extends StructureFeature { + + private static boolean checkLocation(PieceGeneratorSupplier.Context context) { + WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); ++ // Purpur start ++ int salt = org.purpurmc.purpur.PurpurConfig.seedStructureMineshaft; ++ if (salt != -1) worldgenRandom.setLargeFeatureWithSalt(context.seed(), context.chunkPos().x, context.chunkPos().z, salt); else ++ // Purpur end + worldgenRandom.setLargeFeatureSeed(context.seed(), context.chunkPos().x, context.chunkPos().z); + double d = (double)(context.config()).probability; + return worldgenRandom.nextDouble() >= d ? false : context.validBiome().test(context.chunkGenerator().getNoiseBiome(QuartPos.fromBlock(context.chunkPos().getMiddleBlockX()), QuartPos.fromBlock(50), QuartPos.fromBlock(context.chunkPos().getMiddleBlockZ()))); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 60c6793cf7a684f7c111c05fc453413e1ea3fd2f..0ccb09e9c00f7434f4158001c983ab547c7b56e0 100644 +index 64a8dad26d17a9f921d4fd57991dab955e08afb5..ad8d92f04524fa6e7a7a4c390e8b744889dae968 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -194,6 +194,17 @@ public class PurpurConfig {