Fix build

This commit is contained in:
BillyGalbreath
2021-06-11 09:46:11 -05:00
parent cb72751f80
commit b3f1d47932
2 changed files with 16 additions and 70 deletions

View File

@@ -18,7 +18,7 @@ index 5e672a0660d0aceffcdb26d185590ca18aa4f023..4b171a2a60e24947e884f8988920f335
}
final Object val = config.get(key);
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
index 79acb3fbca1abc6260d18ee40f7abb9efd14968b..1938b780d20c1d29d63aefeed7ba42fcd2495986 100644
index 6736b6c29a1b4c8eac7ca0d012b73b501fd99042..1938b780d20c1d29d63aefeed7ba42fcd2495986 100644
--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -1,5 +1,6 @@
@@ -28,26 +28,14 @@ index 79acb3fbca1abc6260d18ee40f7abb9efd14968b..1938b780d20c1d29d63aefeed7ba42fc
import com.destroystokyo.paper.util.SneakyThrow;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.TicketType;
@@ -450,21 +451,19 @@ public final class TuinityConfig {
@@ -449,6 +450,20 @@ public final class TuinityConfig {
final int threads = this.getInt("tick-threads", -1);
this.threads = threads == -1 ? TuinityConfig.tickThreads : threads;
}*/
- public int spawnLimitMonsters;
- public int spawnLimitAnimals;
- public int spawnLimitWaterAmbient;
- public int spawnLimitWaterAnimals;
- public int spawnLimitAmbient;
+
+ public Long populatorSeed;
+ public boolean useRandomPopulatorSeed;
- private void perWorldSpawnLimit() {
- final String path = "spawn-limits";
-
- this.spawnLimitMonsters = this.getIntRaw(path + ".monsters", -1);
- this.spawnLimitAnimals = this.getIntRaw(path + ".animals", -1);
- this.spawnLimitWaterAmbient = this.getIntRaw(path + ".water-ambient", -1);
- this.spawnLimitWaterAnimals = this.getIntRaw(path + ".water-animals", -1);
- this.spawnLimitAmbient = this.getIntRaw(path + ".ambient", -1);
+
+ private void populatorSeed() {
+ final String seedString = this.getString("worldgen.seeds.populator", "default");
+ if (seedString.equalsIgnoreCase("random")) {
@@ -56,7 +44,7 @@ index 79acb3fbca1abc6260d18ee40f7abb9efd14968b..1938b780d20c1d29d63aefeed7ba42fc
+ this.populatorSeed = Long.parseLong(seedString);
+ }
+ if (!TimingsManager.hiddenConfigs.contains("worldgen.seeds.populator")) TimingsManager.hiddenConfigs.add("worldgen.seeds.populator");
}
+ }
+
}