diff --git a/src/main/java/com/minelittlepony/unicopia/Config.java b/src/main/java/com/minelittlepony/unicopia/Config.java index f789d0ef..6abaf38d 100644 --- a/src/main/java/com/minelittlepony/unicopia/Config.java +++ b/src/main/java/com/minelittlepony/unicopia/Config.java @@ -16,17 +16,18 @@ public class Config extends com.minelittlepony.common.util.settings.Config { .addComment("whilst any ones left off are not permitted") .addComment("An empty list disables whitelisting entirely."); - @Deprecated - public final Setting<Set<String>> wantItNeedItEntityExcludelist = value("server", "wantItNeedItEntityExcludelist", (Set<String>)new HashSet<>(Set.of("minecraft:creeper"))) + private final Setting<Set<String>> wantItNeedItEntityExcludelist = value("server", "wantItNeedItEntityExcludelist", (Set<String>)new HashSet<>(Set.of("minecraft:creeper"))) .addComment("A list of entity types that are immune to the want it need it spell's effects"); - @Deprecated - public final Setting<Set<String>> dimensionsWithoutAtmosphere = value("server", "dimensionsWithoutAtmosphere", (Set<String>)new HashSet<String>()) + private final Setting<Set<String>> dimensionsWithoutAtmosphere = value("server", "dimensionsWithoutAtmosphere", (Set<String>)new HashSet<String>()) .addComment("A list of dimensions ids that do not have an atmosphere, and thus shouldn't allow pegasi to fly."); public final Setting<Boolean> enableCheats = value("server", "enableCheats", false) .addComment("Allows use of the /tribe, /unicopia disguise, and /unicopia gravity commands"); + public final Setting<Boolean> enableCloudGen = value("server", "enableCloudGen", true) + .addComment("Sets whether clouds generate"); + public final Setting<Race> preferredRace = value("client", "preferredRace", Race.EARTH) .addComment("The default preferred race") .addComment("This is the race a client requests when first joining a game") diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/gen/CloudCarver.java b/src/main/java/com/minelittlepony/unicopia/server/world/gen/CloudCarver.java index b4406402..4a0f8a4f 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/gen/CloudCarver.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/gen/CloudCarver.java @@ -4,6 +4,7 @@ import java.util.function.Function; import org.apache.commons.lang3.mutable.MutableBoolean; +import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.block.UBlocks; import com.mojang.serialization.Codec; @@ -57,6 +58,9 @@ public class CloudCarver extends CaveCarver { ChunkPos chunkPos, CarvingMask carvingMask ) { + if (!Unicopia.getConfig().enableCloudGen.get()) { + return false; + } CloudCarverContext carverContext = new CloudCarverContext(sampler, random); boolean result = super.carve(context, config, chunk, function, random, carverContext, chunkPos, carvingMask); BlockPos.Mutable mutable = new BlockPos.Mutable();