simplify biome tag injection

This commit is contained in:
dfsek 2022-05-29 03:36:52 -07:00
parent a4d87a428c
commit 43a84cca3d
2 changed files with 12 additions and 18 deletions

View File

@ -17,6 +17,11 @@
package com.dfsek.terra.fabric.generation; package com.dfsek.terra.fabric.generation;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.fabric.data.Codecs;
import com.dfsek.terra.fabric.util.ProtoPlatformBiome;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry; import net.minecraft.util.registry.RegistryEntry;
@ -27,11 +32,6 @@ import org.slf4j.LoggerFactory;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.fabric.data.Codecs;
import com.dfsek.terra.fabric.util.ProtoPlatformBiome;
public class TerraBiomeSource extends BiomeSource { public class TerraBiomeSource extends BiomeSource {
@ -65,11 +65,12 @@ public class TerraBiomeSource extends BiomeSource {
@Override @Override
public RegistryEntry<net.minecraft.world.biome.Biome> getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler noiseSampler) { public RegistryEntry<net.minecraft.world.biome.Biome> getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler noiseSampler) {
return biomeRegistry.getOrCreateEntry(((ProtoPlatformBiome) pack return biomeRegistry
.entryOf(((ProtoPlatformBiome) pack
.getBiomeProvider() .getBiomeProvider()
.getBiome(biomeX << 2, biomeY << 2, biomeZ << 2, seed) .getBiome(biomeX << 2, biomeY << 2, biomeZ << 2, seed)
.getPlatformBiome()) .getPlatformBiome()).getDelegate()
.getDelegate()); );
} }
public BiomeProvider getProvider() { public BiomeProvider getProvider() {

View File

@ -57,14 +57,7 @@ public final class TagUtil {
.computeIfAbsent( .computeIfAbsent(
tag, tag,
t -> new ArrayList<>()) t -> new ArrayList<>())
.add(FabricUtil .add(terra));
.getEntry(
registry,
terra.getKey()
.orElseThrow()
.getValue())
.orElseThrow()));
}, },
() -> logger.error( () -> logger.error(
"No such biome: {}", "No such biome: {}",