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

Small fixes

Browse source
This commit is contained in:
paulevsGitch 2021-06-07 10:16:04 +03:00
parent 19b175f788
commit f89a4f5e2c
6 changed files with 9 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@ import net.minecraft.core.Registry;
import net.minecraft.data.BuiltinRegistries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.Biome.BiomeCategory;
import net.minecraft.world.level.biome.Biomes;
@ -72,8 +71,6 @@ public class EndBiomes {
public static final BiomePicker CAVE_BIOMES = new BiomePicker();
public static final List<BCLBiome> SUBBIOMES = Lists.newArrayList();
private static final JsonObject EMPTY_JSON = new JsonObject();
private static Registry<Biome> biomeRegistry;
private static BiomeMap caveBiomeMap;
// Vanilla Land
@ -126,8 +123,6 @@ public class EndBiomes {
}
public static void mutateRegistry(Registry<Biome> biomeRegistry) {
EndBiomes.biomeRegistry = biomeRegistry;
LAND_BIOMES.clearMutables();
VOID_BIOMES.clearMutables();
CAVE_BIOMES.clearMutables();
@ -224,16 +219,6 @@ public class EndBiomes {
}
}
/**
* Initialize registry if it was not initialized in world generation (when using mods/datapacks, that overrides the End generation)
* @param server - {@link MinecraftServer}
*/
public static void initRegistry(MinecraftServer server) {
if (biomeRegistry == null || biomeRegistry == BuiltinRegistries.BIOME) {
biomeRegistry = server.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
}
}
/**
* Registers new {@link EndBiome} and adds it to picker, can be used to add existing mod biomes into the End.
* @param biome - {@link Biome} instance

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

@ -17,6 +17,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import net.minecraft.world.level.levelgen.placement.FeatureDecorator;
import ru.bclib.api.BiomeAPI;
import ru.bclib.world.biomes.BCLBiome;
import ru.bclib.world.features.BCLFeature;
import ru.bclib.world.features.DefaultFeature;
import ru.betterend.BetterEnd;
@ -296,10 +297,13 @@ public class EndFeatures {
addFeature(ENDER_ORE, features);
addFeature(CRASHED_SHIP, features);
EndBiome endBiome = (EndBiome) BiomeAPI.getBiome(id);
if (endBiome != null && endBiome.hasCaves() && !EndBiomes.VOID_BIOMES.containsImmutable(id)) {
addFeature(ROUND_CAVE, features);
addFeature(TUNEL_CAVE, features);
BCLBiome bclbiome = BiomeAPI.getBiome(id);
if (bclbiome instanceof EndBiome) {
EndBiome endBiome = (EndBiome) bclbiome;
if (endBiome.hasCaves() && !EndBiomes.VOID_BIOMES.containsImmutable(id)) {
addFeature(ROUND_CAVE, features);
addFeature(TUNEL_CAVE, features);
}
}
BCLFeature feature = BiomeAPI.getBiome(id).getStructuresFeature();