Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move all config stuff to config patch

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-25 20:08:05 -05:00
parent 44e4acda63
commit 4a2d580185
146 changed files with 506 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -93,54 +93,11 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 19d32ceea05206680b8d9a20f28c618b5817606c..65aba9a17a76e56c0140220ab00645a1e02cc8b5 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -310,7 +310,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Tuinity - Server Config
- this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Purpur
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
this.generator = gen;
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d821a0544a4bb3a5f015a81d64e73e3ed10f3bad..51997b73e5020e722915bce5db18909174d6697d 100644
index 093c44cba0675316479f5d96434092821804cfa0..2e2f5e7ca914abf1a1d22c8ea03f363643f46488 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -8,6 +8,8 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.level.Explosion;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
+import org.apache.commons.lang.BooleanUtils;
+import org.bukkit.World;
import org.bukkit.configuration.ConfigurationSection;
import java.util.ArrayList;
@@ -16,6 +18,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.Predicate;
import java.util.logging.Level;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -24,9 +27,11 @@ public class PurpurWorldConfig {
private final ServerLevel level;
private final String worldName;
- public PurpurWorldConfig(ServerLevel level, String worldName) {
+ private final World.Environment environment;
+ public PurpurWorldConfig(ServerLevel level, String worldName, World.Environment environment) {
this.level = level;
this.worldName = worldName;
+ this.environment = environment;
init();
}
@@ -54,6 +59,12 @@ public class PurpurWorldConfig {
@@ -63,6 +63,12 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
}
@@ -153,7 +110,7 @@ index d821a0544a4bb3a5f015a81d64e73e3ed10f3bad..51997b73e5020e722915bce5db189091
private double getDouble(String path, double def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
@@ -202,6 +213,21 @@ public class PurpurWorldConfig {
@@ -211,6 +217,21 @@ public class PurpurWorldConfig {
}
}