MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix missing cave config entries

Browse source
This commit is contained in:
paulevsGitch 2021-10-26 17:22:39 +03:00
parent ce7a8fc70a
commit 5fd0595a78
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/ru/betterend/registry/EndFeatures.java
View file

@ -19,6 +19,8 @@ import ru.bclib.world.features.BCLFeature;
import ru.bclib.world.features.DefaultFeature; import ru.bclib.world.features.DefaultFeature;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.complexmaterials.StoneMaterial; import ru.betterend.complexmaterials.StoneMaterial;
import ru.betterend.config.Configs;
import ru.betterend.world.biome.cave.EndCaveBiome;
import ru.betterend.world.features.BiomeIslandFeature; import ru.betterend.world.features.BiomeIslandFeature;
import ru.betterend.world.features.BlueVineFeature; import ru.betterend.world.features.BlueVineFeature;
import ru.betterend.world.features.CavePumpkinFeature; import ru.betterend.world.features.CavePumpkinFeature;
@ -351,11 +353,13 @@ public class EndFeatures {
addFeature(CRASHED_SHIP, features); addFeature(CRASHED_SHIP, features);
BCLBiome bclbiome = BiomeAPI.getBiome(id); BCLBiome bclbiome = BiomeAPI.getBiome(id);
boolean hasCaves = bclbiome.getCustomData("has_caves", true); boolean hasCaves = bclbiome.getCustomData("has_caves", true) && !(bclbiome instanceof EndCaveBiome);
if (hasCaves && !BiomeAPI.END_VOID_BIOME_PICKER.containsImmutable(id)) { if (hasCaves && !BiomeAPI.END_VOID_BIOME_PICKER.containsImmutable(id)) {
if (Configs.BIOME_CONFIG.getBoolean(id, "hasCaves", true)) {
addFeature(ROUND_CAVE, features); addFeature(ROUND_CAVE, features);
addFeature(TUNEL_CAVE, features); addFeature(TUNEL_CAVE, features);
} }
}
BCLFeature feature = BiomeAPI.getBiome(id).getStructuresFeature(); BCLFeature feature = BiomeAPI.getBiome(id).getStructuresFeature();
if (feature != null) { if (feature != null) {
@ -369,7 +373,12 @@ public class EndFeatures {
def.addFeature(ENDER_ORE); def.addFeature(ENDER_ORE);
def.addFeature(CRASHED_SHIP); def.addFeature(CRASHED_SHIP);
if (def.getID().getPath().endsWith("_cave")) {
return;
}
boolean hasCaves = def.getCustomData("has_caves", true); boolean hasCaves = def.getCustomData("has_caves", true);
hasCaves = Configs.BIOME_CONFIG.getBoolean(def.getID(), "hasCaves", hasCaves);
if (hasCaves) { if (hasCaves) {
def.addFeature(ROUND_CAVE); def.addFeature(ROUND_CAVE);
def.addFeature(TUNEL_CAVE); def.addFeature(TUNEL_CAVE);
@ -379,9 +388,7 @@ public class EndFeatures {
private static void addFeature(BCLFeature feature, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) { private static void addFeature(BCLFeature feature, List<List<Supplier<ConfiguredFeature<?, ?>>>> features) {
int index = feature.getFeatureStep().ordinal(); int index = feature.getFeatureStep().ordinal();
if (features.size() > index) { if (features.size() > index) {
features.get(index).add(() -> { features.get(index).add(() -> feature.getFeatureConfigured());
return feature.getFeatureConfigured();
});
} }
else { else {
List<Supplier<ConfiguredFeature<?, ?>>> newFeature = Lists.newArrayList(); List<Supplier<ConfiguredFeature<?, ?>>> newFeature = Lists.newArrayList();

9
src/main/java/ru/betterend/util/FeaturesHelper.java
View file

@ -7,6 +7,7 @@ import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import ru.bclib.api.BiomeAPI; import ru.bclib.api.BiomeAPI;
import ru.betterend.config.Configs;
import ru.betterend.mixin.common.BiomeGenerationSettingsAccessor; import ru.betterend.mixin.common.BiomeGenerationSettingsAccessor;
import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndStructures; import ru.betterend.registry.EndStructures;
@ -23,11 +24,8 @@ public class FeaturesHelper {
BiomeGenerationSettingsAccessor accessor = (BiomeGenerationSettingsAccessor) biome.getGenerationSettings(); BiomeGenerationSettingsAccessor accessor = (BiomeGenerationSettingsAccessor) biome.getGenerationSettings();
List<Supplier<ConfiguredStructureFeature<?, ?>>> structures = Lists.newArrayList(accessor.be_getStructures()); List<Supplier<ConfiguredStructureFeature<?, ?>>> structures = Lists.newArrayList(accessor.be_getStructures());
List<List<Supplier<ConfiguredFeature<?, ?>>>> preFeatures = accessor.be_getFeatures(); List<List<Supplier<ConfiguredFeature<?, ?>>>> preFeatures = accessor.be_getFeatures();
List<List<Supplier<ConfiguredFeature<?, ?>>>> features = new ArrayList<List<Supplier<ConfiguredFeature<?, ?>>>>( List<List<Supplier<ConfiguredFeature<?, ?>>>> features = new ArrayList<>(preFeatures.size());
preFeatures.size()); preFeatures.forEach((list) -> features.add(Lists.newArrayList(list)));
preFeatures.forEach((list) -> {
features.add(Lists.newArrayList(list));
});
EndFeatures.registerBiomeFeatures(key, biome, features); EndFeatures.registerBiomeFeatures(key, biome, features);
EndStructures.registerBiomeStructures(key, biome, structures); EndStructures.registerBiomeStructures(key, biome, structures);
@ -36,5 +34,6 @@ public class FeaturesHelper {
accessor.be_setStructures(structures); accessor.be_setStructures(structures);
} }
}); });
Configs.BIOME_CONFIG.saveChanges();
} }
} }

1
src/main/java/ru/betterend/world/biome/EndBiome.java
View file

@ -10,7 +10,6 @@ import ru.betterend.registry.EndFeatures;
public class EndBiome extends BCLBiome { public class EndBiome extends BCLBiome {
public EndBiome(BCLBiomeDef def) { public EndBiome(BCLBiomeDef def) {
super(updateDef(def)); super(updateDef(def));
} }
public EndBiome(ResourceLocation id, Biome biome, float fogDensity, float genChance, boolean hasCaves) { public EndBiome(ResourceLocation id, Biome biome, float fogDensity, float genChance, boolean hasCaves) {