mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
57 lines
3.5 KiB
Diff
57 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Wed, 15 Jul 2020 12:40:25 -0500
|
|
Subject: [PATCH] Configurable dungeon seed
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java b/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java
|
|
index 70d222996..73a2f2969 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java
|
|
@@ -14,10 +14,12 @@ public class WorldGenDecoratorDungeon extends WorldGenDecorator<WorldGenDecorato
|
|
public Stream<BlockPosition> a(GeneratorAccess generatoraccess, ChunkGenerator chunkgenerator, Random random, WorldGenDecoratorDungeonConfiguration worldgendecoratordungeonconfiguration, BlockPosition blockposition) {
|
|
int i = worldgendecoratordungeonconfiguration.b;
|
|
|
|
+ int seed = net.pl3x.purpur.PurpurConfig.dungeonSeed; // Purpur
|
|
+ final Random rand = seed == -1 ? random : new Random(seed); // Purpur
|
|
return IntStream.range(0, i).mapToObj((j) -> {
|
|
- int k = random.nextInt(16) + blockposition.getX();
|
|
- int l = random.nextInt(16) + blockposition.getZ();
|
|
- int i1 = random.nextInt(chunkgenerator.getGenerationDepth());
|
|
+ int k = rand.nextInt(16) + blockposition.getX(); // Purpur
|
|
+ int l = rand.nextInt(16) + blockposition.getZ(); // Purpur
|
|
+ int i1 = rand.nextInt(chunkgenerator.getGenerationDepth()); // Purpur
|
|
|
|
return new BlockPosition(k, i1, l);
|
|
});
|
|
diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java
|
|
index 3c7c93645..e13176fb0 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenDungeons.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java
|
|
@@ -16,7 +16,10 @@ public class WorldGenDungeons extends WorldGenerator<WorldGenFeatureEmptyConfigu
|
|
super(codec);
|
|
}
|
|
|
|
+ public boolean generate(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEmptyConfiguration worldgenfeatureemptyconfiguration) { return a(generatoraccessseed, structuremanager, chunkgenerator, random, blockposition, worldgenfeatureemptyconfiguration); } // Purpur - decompile error?
|
|
public boolean a(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEmptyConfiguration worldgenfeatureemptyconfiguration) {
|
|
+ int seed = net.pl3x.purpur.PurpurConfig.dungeonSeed; // Purpur
|
|
+ if (seed != -1) random = new Random(seed); // Purpur
|
|
boolean flag = true;
|
|
int i = random.nextInt(2) + 2;
|
|
int j = -i - 1;
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index f9b382dcc..cd524cabc 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -142,8 +142,10 @@ public class PurpurConfig {
|
|
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
|
|
}
|
|
|
|
+ public static int dungeonSeed = -1;
|
|
public static int endSpikeSeed = -1;
|
|
private static void seedSettings() {
|
|
+ dungeonSeed = getInt("settings.seed.dungeon", dungeonSeed);
|
|
endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
|
|
}
|
|
|