more progress

This commit is contained in:
BillyGalbreath
2021-06-19 15:58:07 -05:00
parent f3e366449c
commit 526a0beb38
78 changed files with 628 additions and 674 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 34be3abec773b4b2bcd9b3faca33d2c72ef4d895..dc968864cef387d362b116a9e733859b7460f967 100644
index 0ef7b405ad9174045128fb5445f0bc0e22a3f2e2..d10ebe9b094a0e8b62e6607a4fefaf0bcd412413 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
@@ -107,7 +107,7 @@ index 1f9129180badb6df786b080edf926d04ef95125c..917a671894e16e024db941cea1845e39
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 a956362ed2b724a50c8f7023799bd3314b287020..bba3f5f0d2802d706b8b8ac17ae194157870bbf6 100644
index 8d70915300f563affb7d8ab631699c484fb9c8f8..81b278aa74073b2e01a33635c33cb723de8cc3ad 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.level.Explosion;
@@ -153,8 +153,8 @@ index a956362ed2b724a50c8f7023799bd3314b287020..bba3f5f0d2802d706b8b8ac17ae19415
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));
@@ -99,6 +110,21 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
@@ -201,6 +212,21 @@ public class PurpurWorldConfig {
}
}
+ public boolean catSpawning;
@@ -172,6 +172,6 @@ index a956362ed2b724a50c8f7023799bd3314b287020..bba3f5f0d2802d706b8b8ac17ae19415
+ villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
+ }
+
public int elytraDamagePerSecond = 1;
public double elytraDamageMultiplyBySpeed = 0;
public boolean elytraIgnoreUnbreaking = false;
public boolean idleTimeoutKick = true;
public boolean idleTimeoutTickNearbyEntities = true;
public boolean idleTimeoutCountAsSleeping = false;