446 lines
24 KiB
Java
446 lines
24 KiB
Java
package net.minecraft.util.datafix.fixes;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.ImmutableMap.Builder;
|
|
import com.mojang.datafixers.DSL;
|
|
import com.mojang.datafixers.DataFix;
|
|
import com.mojang.datafixers.TypeRewriteRule;
|
|
import com.mojang.datafixers.Typed;
|
|
import com.mojang.datafixers.schemas.Schema;
|
|
import com.mojang.serialization.Codec;
|
|
import com.mojang.serialization.Dynamic;
|
|
import com.mojang.serialization.DynamicLike;
|
|
import com.mojang.serialization.DynamicOps;
|
|
import com.mojang.serialization.OptionalDynamic;
|
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
|
import com.mojang.serialization.codecs.RecordCodecBuilder.Instance;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.Objects;
|
|
import java.util.Optional;
|
|
import java.util.Map.Entry;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Stream;
|
|
import org.apache.commons.lang3.math.NumberUtils;
|
|
import org.apache.commons.lang3.mutable.MutableBoolean;
|
|
import org.apache.commons.lang3.mutable.MutableInt;
|
|
|
|
public class WorldGenSettingsFix extends DataFix {
|
|
private static final String VILLAGE = "minecraft:village";
|
|
private static final String DESERT_PYRAMID = "minecraft:desert_pyramid";
|
|
private static final String IGLOO = "minecraft:igloo";
|
|
private static final String JUNGLE_TEMPLE = "minecraft:jungle_pyramid";
|
|
private static final String SWAMP_HUT = "minecraft:swamp_hut";
|
|
private static final String PILLAGER_OUTPOST = "minecraft:pillager_outpost";
|
|
private static final String END_CITY = "minecraft:endcity";
|
|
private static final String WOODLAND_MANSION = "minecraft:mansion";
|
|
private static final String OCEAN_MONUMENT = "minecraft:monument";
|
|
private static final ImmutableMap<String, WorldGenSettingsFix.StructureFeatureConfiguration> DEFAULTS = ImmutableMap.<String, WorldGenSettingsFix.StructureFeatureConfiguration>builder()
|
|
.put("minecraft:village", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 8, 10387312))
|
|
.put("minecraft:desert_pyramid", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 8, 14357617))
|
|
.put("minecraft:igloo", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 8, 14357618))
|
|
.put("minecraft:jungle_pyramid", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 8, 14357619))
|
|
.put("minecraft:swamp_hut", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 8, 14357620))
|
|
.put("minecraft:pillager_outpost", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 8, 165745296))
|
|
.put("minecraft:monument", new WorldGenSettingsFix.StructureFeatureConfiguration(32, 5, 10387313))
|
|
.put("minecraft:endcity", new WorldGenSettingsFix.StructureFeatureConfiguration(20, 11, 10387313))
|
|
.put("minecraft:mansion", new WorldGenSettingsFix.StructureFeatureConfiguration(80, 20, 10387319))
|
|
.build();
|
|
|
|
public WorldGenSettingsFix(Schema p_17173_) {
|
|
super(p_17173_, true);
|
|
}
|
|
|
|
@Override
|
|
protected TypeRewriteRule makeRule() {
|
|
return this.fixTypeEverywhereTyped(
|
|
"WorldGenSettings building",
|
|
this.getInputSchema().getType(References.WORLD_GEN_SETTINGS),
|
|
p_17184_ -> p_17184_.update(DSL.remainderFinder(), WorldGenSettingsFix::fix)
|
|
);
|
|
}
|
|
|
|
private static <T> Dynamic<T> noise(long p_17175_, DynamicLike<T> p_17176_, Dynamic<T> p_17177_, Dynamic<T> p_17178_) {
|
|
return p_17176_.createMap(
|
|
ImmutableMap.of(
|
|
p_17176_.createString("type"),
|
|
p_17176_.createString("minecraft:noise"),
|
|
p_17176_.createString("biome_source"),
|
|
p_17178_,
|
|
p_17176_.createString("seed"),
|
|
p_17176_.createLong(p_17175_),
|
|
p_17176_.createString("settings"),
|
|
p_17177_
|
|
)
|
|
);
|
|
}
|
|
|
|
private static <T> Dynamic<T> vanillaBiomeSource(Dynamic<T> p_17196_, long p_17197_, boolean p_17198_, boolean p_17199_) {
|
|
Builder<Dynamic<T>, Dynamic<T>> builder = ImmutableMap.<Dynamic<T>, Dynamic<T>>builder()
|
|
.put(p_17196_.createString("type"), p_17196_.createString("minecraft:vanilla_layered"))
|
|
.put(p_17196_.createString("seed"), p_17196_.createLong(p_17197_))
|
|
.put(p_17196_.createString("large_biomes"), p_17196_.createBoolean(p_17199_));
|
|
if (p_17198_) {
|
|
builder.put(p_17196_.createString("legacy_biome_init_layer"), p_17196_.createBoolean(p_17198_));
|
|
}
|
|
|
|
return p_17196_.createMap(builder.build());
|
|
}
|
|
|
|
private static <T> Dynamic<T> fix(Dynamic<T> p_17186_) {
|
|
DynamicOps<T> dynamicops = p_17186_.getOps();
|
|
long i = p_17186_.get("RandomSeed").asLong(0L);
|
|
Optional<String> optional = p_17186_.get("generatorName").asString().map(p_17227_ -> p_17227_.toLowerCase(Locale.ROOT)).result();
|
|
Optional<String> optional1 = p_17186_.get("legacy_custom_options")
|
|
.asString()
|
|
.result()
|
|
.map(Optional::of)
|
|
.orElseGet(() -> optional.equals(Optional.of("customized")) ? p_17186_.get("generatorOptions").asString().result() : Optional.empty());
|
|
boolean flag = false;
|
|
Dynamic<T> dynamic;
|
|
if (optional.equals(Optional.of("customized"))) {
|
|
dynamic = defaultOverworld(p_17186_, i);
|
|
} else if (optional.isEmpty()) {
|
|
dynamic = defaultOverworld(p_17186_, i);
|
|
} else {
|
|
String $$28 = optional.get();
|
|
switch ($$28) {
|
|
case "flat":
|
|
OptionalDynamic<T> optionaldynamic = p_17186_.get("generatorOptions");
|
|
Map<Dynamic<T>, Dynamic<T>> map = fixFlatStructures(dynamicops, optionaldynamic);
|
|
dynamic = p_17186_.createMap(
|
|
ImmutableMap.of(
|
|
p_17186_.createString("type"),
|
|
p_17186_.createString("minecraft:flat"),
|
|
p_17186_.createString("settings"),
|
|
p_17186_.createMap(
|
|
ImmutableMap.of(
|
|
p_17186_.createString("structures"),
|
|
p_17186_.createMap(map),
|
|
p_17186_.createString("layers"),
|
|
optionaldynamic.get("layers")
|
|
.result()
|
|
.orElseGet(
|
|
() -> p_17186_.createList(
|
|
Stream.of(
|
|
p_17186_.createMap(
|
|
ImmutableMap.of(
|
|
p_17186_.createString("height"),
|
|
p_17186_.createInt(1),
|
|
p_17186_.createString("block"),
|
|
p_17186_.createString("minecraft:bedrock")
|
|
)
|
|
),
|
|
p_17186_.createMap(
|
|
ImmutableMap.of(
|
|
p_17186_.createString("height"),
|
|
p_17186_.createInt(2),
|
|
p_17186_.createString("block"),
|
|
p_17186_.createString("minecraft:dirt")
|
|
)
|
|
),
|
|
p_17186_.createMap(
|
|
ImmutableMap.of(
|
|
p_17186_.createString("height"),
|
|
p_17186_.createInt(1),
|
|
p_17186_.createString("block"),
|
|
p_17186_.createString("minecraft:grass_block")
|
|
)
|
|
)
|
|
)
|
|
)
|
|
),
|
|
p_17186_.createString("biome"),
|
|
p_17186_.createString(optionaldynamic.get("biome").asString("minecraft:plains"))
|
|
)
|
|
)
|
|
)
|
|
);
|
|
break;
|
|
case "debug_all_block_states":
|
|
dynamic = p_17186_.createMap(ImmutableMap.of(p_17186_.createString("type"), p_17186_.createString("minecraft:debug")));
|
|
break;
|
|
case "buffet":
|
|
OptionalDynamic<T> optionaldynamic1 = p_17186_.get("generatorOptions");
|
|
OptionalDynamic<?> optionaldynamic2 = optionaldynamic1.get("chunk_generator");
|
|
Optional<String> optional2 = optionaldynamic2.get("type").asString().result();
|
|
Dynamic<T> dynamic1;
|
|
if (Objects.equals(optional2, Optional.of("minecraft:caves"))) {
|
|
dynamic1 = p_17186_.createString("minecraft:caves");
|
|
flag = true;
|
|
} else if (Objects.equals(optional2, Optional.of("minecraft:floating_islands"))) {
|
|
dynamic1 = p_17186_.createString("minecraft:floating_islands");
|
|
} else {
|
|
dynamic1 = p_17186_.createString("minecraft:overworld");
|
|
}
|
|
|
|
Dynamic<T> dynamic2 = optionaldynamic1.get("biome_source")
|
|
.result()
|
|
.orElseGet(() -> p_17186_.createMap(ImmutableMap.of(p_17186_.createString("type"), p_17186_.createString("minecraft:fixed"))));
|
|
Dynamic<T> dynamic3;
|
|
if (dynamic2.get("type").asString().result().equals(Optional.of("minecraft:fixed"))) {
|
|
String s1 = dynamic2.get("options")
|
|
.get("biomes")
|
|
.asStream()
|
|
.findFirst()
|
|
.flatMap(p_326673_ -> p_326673_.asString().result())
|
|
.orElse("minecraft:ocean");
|
|
dynamic3 = dynamic2.remove("options").set("biome", p_17186_.createString(s1));
|
|
} else {
|
|
dynamic3 = dynamic2;
|
|
}
|
|
|
|
dynamic = noise(i, p_17186_, dynamic1, dynamic3);
|
|
break;
|
|
default:
|
|
boolean flag1 = optional.get().equals("default");
|
|
boolean flag2 = optional.get().equals("default_1_1") || flag1 && p_17186_.get("generatorVersion").asInt(0) == 0;
|
|
boolean flag3 = optional.get().equals("amplified");
|
|
boolean flag4 = optional.get().equals("largebiomes");
|
|
dynamic = noise(
|
|
i, p_17186_, p_17186_.createString(flag3 ? "minecraft:amplified" : "minecraft:overworld"), vanillaBiomeSource(p_17186_, i, flag2, flag4)
|
|
);
|
|
}
|
|
}
|
|
|
|
boolean flag5 = p_17186_.get("MapFeatures").asBoolean(true);
|
|
boolean flag6 = p_17186_.get("BonusChest").asBoolean(false);
|
|
Builder<T, T> builder = ImmutableMap.builder();
|
|
builder.put(dynamicops.createString("seed"), dynamicops.createLong(i));
|
|
builder.put(dynamicops.createString("generate_features"), dynamicops.createBoolean(flag5));
|
|
builder.put(dynamicops.createString("bonus_chest"), dynamicops.createBoolean(flag6));
|
|
builder.put(dynamicops.createString("dimensions"), vanillaLevels(p_17186_, i, dynamic, flag));
|
|
optional1.ifPresent(p_17182_ -> builder.put(dynamicops.createString("legacy_custom_options"), dynamicops.createString(p_17182_)));
|
|
return new Dynamic<>(dynamicops, dynamicops.createMap(builder.build()));
|
|
}
|
|
|
|
protected static <T> Dynamic<T> defaultOverworld(Dynamic<T> p_17188_, long p_17189_) {
|
|
return noise(p_17189_, p_17188_, p_17188_.createString("minecraft:overworld"), vanillaBiomeSource(p_17188_, p_17189_, false, false));
|
|
}
|
|
|
|
protected static <T> T vanillaLevels(Dynamic<T> p_17191_, long p_17192_, Dynamic<T> p_17193_, boolean p_17194_) {
|
|
DynamicOps<T> dynamicops = p_17191_.getOps();
|
|
return dynamicops.createMap(
|
|
ImmutableMap.of(
|
|
dynamicops.createString("minecraft:overworld"),
|
|
dynamicops.createMap(
|
|
ImmutableMap.of(
|
|
dynamicops.createString("type"),
|
|
dynamicops.createString("minecraft:overworld" + (p_17194_ ? "_caves" : "")),
|
|
dynamicops.createString("generator"),
|
|
p_17193_.getValue()
|
|
)
|
|
),
|
|
dynamicops.createString("minecraft:the_nether"),
|
|
dynamicops.createMap(
|
|
ImmutableMap.of(
|
|
dynamicops.createString("type"),
|
|
dynamicops.createString("minecraft:the_nether"),
|
|
dynamicops.createString("generator"),
|
|
noise(
|
|
p_17192_,
|
|
p_17191_,
|
|
p_17191_.createString("minecraft:nether"),
|
|
p_17191_.createMap(
|
|
ImmutableMap.of(
|
|
p_17191_.createString("type"),
|
|
p_17191_.createString("minecraft:multi_noise"),
|
|
p_17191_.createString("seed"),
|
|
p_17191_.createLong(p_17192_),
|
|
p_17191_.createString("preset"),
|
|
p_17191_.createString("minecraft:nether")
|
|
)
|
|
)
|
|
)
|
|
.getValue()
|
|
)
|
|
),
|
|
dynamicops.createString("minecraft:the_end"),
|
|
dynamicops.createMap(
|
|
ImmutableMap.of(
|
|
dynamicops.createString("type"),
|
|
dynamicops.createString("minecraft:the_end"),
|
|
dynamicops.createString("generator"),
|
|
noise(
|
|
p_17192_,
|
|
p_17191_,
|
|
p_17191_.createString("minecraft:end"),
|
|
p_17191_.createMap(
|
|
ImmutableMap.of(
|
|
p_17191_.createString("type"),
|
|
p_17191_.createString("minecraft:the_end"),
|
|
p_17191_.createString("seed"),
|
|
p_17191_.createLong(p_17192_)
|
|
)
|
|
)
|
|
)
|
|
.getValue()
|
|
)
|
|
)
|
|
)
|
|
);
|
|
}
|
|
|
|
private static <T> Map<Dynamic<T>, Dynamic<T>> fixFlatStructures(DynamicOps<T> p_17218_, OptionalDynamic<T> p_17219_) {
|
|
MutableInt mutableint = new MutableInt(32);
|
|
MutableInt mutableint1 = new MutableInt(3);
|
|
MutableInt mutableint2 = new MutableInt(128);
|
|
MutableBoolean mutableboolean = new MutableBoolean(false);
|
|
Map<String, WorldGenSettingsFix.StructureFeatureConfiguration> map = Maps.newHashMap();
|
|
if (p_17219_.result().isEmpty()) {
|
|
mutableboolean.setTrue();
|
|
map.put("minecraft:village", DEFAULTS.get("minecraft:village"));
|
|
}
|
|
|
|
p_17219_.get("structures")
|
|
.flatMap(Dynamic::getMapValues)
|
|
.ifSuccess(
|
|
p_17257_ -> p_17257_.forEach(
|
|
(p_326671_, p_326672_) -> p_326672_.getMapValues()
|
|
.result()
|
|
.ifPresent(
|
|
p_145816_ -> p_145816_.forEach(
|
|
(p_145807_, p_145808_) -> {
|
|
String s = p_326671_.asString("");
|
|
String s1 = p_145807_.asString("");
|
|
String s2 = p_145808_.asString("");
|
|
if ("stronghold".equals(s)) {
|
|
mutableboolean.setTrue();
|
|
switch (s1) {
|
|
case "distance":
|
|
mutableint.setValue(getInt(s2, mutableint.getValue(), 1));
|
|
return;
|
|
case "spread":
|
|
mutableint1.setValue(getInt(s2, mutableint1.getValue(), 1));
|
|
return;
|
|
case "count":
|
|
mutableint2.setValue(getInt(s2, mutableint2.getValue(), 1));
|
|
return;
|
|
}
|
|
} else {
|
|
switch (s1) {
|
|
case "distance":
|
|
switch (s) {
|
|
case "village":
|
|
setSpacing(map, "minecraft:village", s2, 9);
|
|
return;
|
|
case "biome_1":
|
|
setSpacing(map, "minecraft:desert_pyramid", s2, 9);
|
|
setSpacing(map, "minecraft:igloo", s2, 9);
|
|
setSpacing(map, "minecraft:jungle_pyramid", s2, 9);
|
|
setSpacing(map, "minecraft:swamp_hut", s2, 9);
|
|
setSpacing(map, "minecraft:pillager_outpost", s2, 9);
|
|
return;
|
|
case "endcity":
|
|
setSpacing(map, "minecraft:endcity", s2, 1);
|
|
return;
|
|
case "mansion":
|
|
setSpacing(map, "minecraft:mansion", s2, 1);
|
|
return;
|
|
default:
|
|
return;
|
|
}
|
|
case "separation":
|
|
if ("oceanmonument".equals(s)) {
|
|
WorldGenSettingsFix.StructureFeatureConfiguration worldgensettingsfix$structurefeatureconfiguration = map.getOrDefault(
|
|
"minecraft:monument", DEFAULTS.get("minecraft:monument")
|
|
);
|
|
int i = getInt(s2, worldgensettingsfix$structurefeatureconfiguration.separation, 1);
|
|
map.put(
|
|
"minecraft:monument",
|
|
new WorldGenSettingsFix.StructureFeatureConfiguration(
|
|
i,
|
|
worldgensettingsfix$structurefeatureconfiguration.separation,
|
|
worldgensettingsfix$structurefeatureconfiguration.salt
|
|
)
|
|
);
|
|
}
|
|
|
|
return;
|
|
case "spacing":
|
|
if ("oceanmonument".equals(s)) {
|
|
setSpacing(map, "minecraft:monument", s2, 1);
|
|
}
|
|
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
)
|
|
)
|
|
)
|
|
);
|
|
Builder<Dynamic<T>, Dynamic<T>> builder = ImmutableMap.builder();
|
|
builder.put(
|
|
p_17219_.createString("structures"),
|
|
p_17219_.createMap(
|
|
map.entrySet()
|
|
.stream()
|
|
.collect(Collectors.toMap(p_17225_ -> p_17219_.createString(p_17225_.getKey()), p_17222_ -> p_17222_.getValue().serialize(p_17218_)))
|
|
)
|
|
);
|
|
if (mutableboolean.isTrue()) {
|
|
builder.put(
|
|
p_17219_.createString("stronghold"),
|
|
p_17219_.createMap(
|
|
ImmutableMap.of(
|
|
p_17219_.createString("distance"),
|
|
p_17219_.createInt(mutableint.getValue()),
|
|
p_17219_.createString("spread"),
|
|
p_17219_.createInt(mutableint1.getValue()),
|
|
p_17219_.createString("count"),
|
|
p_17219_.createInt(mutableint2.getValue())
|
|
)
|
|
)
|
|
);
|
|
}
|
|
|
|
return builder.build();
|
|
}
|
|
|
|
private static int getInt(String p_17229_, int p_17230_) {
|
|
return NumberUtils.toInt(p_17229_, p_17230_);
|
|
}
|
|
|
|
private static int getInt(String p_17232_, int p_17233_, int p_17234_) {
|
|
return Math.max(p_17234_, getInt(p_17232_, p_17233_));
|
|
}
|
|
|
|
private static void setSpacing(Map<String, WorldGenSettingsFix.StructureFeatureConfiguration> p_17236_, String p_17237_, String p_17238_, int p_17239_) {
|
|
WorldGenSettingsFix.StructureFeatureConfiguration worldgensettingsfix$structurefeatureconfiguration = p_17236_.getOrDefault(
|
|
p_17237_, DEFAULTS.get(p_17237_)
|
|
);
|
|
int i = getInt(p_17238_, worldgensettingsfix$structurefeatureconfiguration.spacing, p_17239_);
|
|
p_17236_.put(
|
|
p_17237_,
|
|
new WorldGenSettingsFix.StructureFeatureConfiguration(
|
|
i, worldgensettingsfix$structurefeatureconfiguration.separation, worldgensettingsfix$structurefeatureconfiguration.salt
|
|
)
|
|
);
|
|
}
|
|
|
|
static final class StructureFeatureConfiguration {
|
|
public static final Codec<WorldGenSettingsFix.StructureFeatureConfiguration> CODEC = RecordCodecBuilder.create(
|
|
p_17279_ -> p_17279_.group(
|
|
Codec.INT.fieldOf("spacing").forGetter(p_145830_ -> p_145830_.spacing),
|
|
Codec.INT.fieldOf("separation").forGetter(p_145828_ -> p_145828_.separation),
|
|
Codec.INT.fieldOf("salt").forGetter(p_145826_ -> p_145826_.salt)
|
|
)
|
|
.apply(p_17279_, WorldGenSettingsFix.StructureFeatureConfiguration::new)
|
|
);
|
|
final int spacing;
|
|
final int separation;
|
|
final int salt;
|
|
|
|
public StructureFeatureConfiguration(int p_17271_, int p_17272_, int p_17273_) {
|
|
this.spacing = p_17271_;
|
|
this.separation = p_17272_;
|
|
this.salt = p_17273_;
|
|
}
|
|
|
|
public <T> Dynamic<T> serialize(DynamicOps<T> p_17277_) {
|
|
return new Dynamic<>(p_17277_, CODEC.encodeStart(p_17277_, this).result().orElse(p_17277_.emptyMap()));
|
|
}
|
|
}
|
|
} |