From 0228facd71401d849ec024061d96ca43f18cb3cd Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 25 May 2022 00:43:52 -0700 Subject: [PATCH] sort of fix more stuff --- .../dfsek/terra/fabric/generation/TerraBiomeSource.java | 4 ---- .../main/java/com/dfsek/terra/fabric/util/FabricUtil.java | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index c3b8b29fb..4138c7563 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -17,16 +17,12 @@ package com.dfsek.terra.fabric.generation; -import com.dfsek.terra.fabric.util.FabricUtil; - import com.mojang.serialization.Codec; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryEntry; import net.minecraft.world.biome.source.BiomeSource; import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler; -import java.util.Objects; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; import com.dfsek.terra.api.config.ConfigPack; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index bcf9b408c..47cea5095 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -27,6 +27,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryEntry; +import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.WorldAccess; import net.minecraft.world.biome.Biome.Builder; import net.minecraft.world.biome.BiomeEffects; @@ -95,13 +96,17 @@ public final class FabricUtil { if(registry.containsId(identifier)) { ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(FabricUtil.getEntry(registry, identifier).orElseThrow()); } else { - ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(BuiltinRegistries.add(registry, identifier, minecraftBiome)); + ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(BuiltinRegistries.add(registry, registerKey(identifier).getValue(), minecraftBiome)); } TERRA_BIOME_MAP.computeIfAbsent(vanilla.getKey().orElseThrow().getValue(), i -> new ArrayList<>()).add(identifier); } } + private static RegistryKey registerKey(Identifier identifier){ + return RegistryKey.of(Registry.BIOME_KEY, identifier); + } + public static void registerTags(Registry registry) { logger.info("Doing tag garbage...."); Map, List>> collect = registry