mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 14:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

register normal tag to Terra world presets

Browse Source
This commit is contained in:
dfsek
2022-06-05 17:18:24 -07:00
parent 76e8c2d2b1
commit ed7bfd2d68
3 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
+2
View File
@@ -19,6 +19,8 @@ public class DataPackContentsMixin {
*/ */
@Inject(method = "refresh(Lnet/minecraft/util/registry/DynamicRegistryManager;)V", at = @At("RETURN")) @Inject(method = "refresh(Lnet/minecraft/util/registry/DynamicRegistryManager;)V", at = @At("RETURN"))
private void injectReload(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) { private void injectReload(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) {
TagUtil.registerWorldPresetTags(dynamicRegistryManager.get(Registry.WORLD_PRESET_KEY));
Registry<Biome> biomeRegistry = dynamicRegistryManager.get(Registry.BIOME_KEY); Registry<Biome> biomeRegistry = dynamicRegistryManager.get(Registry.BIOME_KEY);
TagUtil.registerBiomeTags(biomeRegistry); TagUtil.registerBiomeTags(biomeRegistry);
BiomeUtil.registerFlora(biomeRegistry); BiomeUtil.registerFlora(biomeRegistry);
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/LifecycleUtil.java
+9
View File
@@ -24,6 +24,8 @@ import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@@ -31,6 +33,7 @@ import java.util.Map;
public class LifecycleUtil { public class LifecycleUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleUtil.class); private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleUtil.class);
private static final List<Identifier> PRESETS = new ArrayList<>();
public static void initialize() { public static void initialize() {
FabricEntryPoint.getPlatform().getEventManager().callEvent( FabricEntryPoint.getPlatform().getEventManager().callEvent(
new PlatformInitializationEvent()); new PlatformInitializationEvent());
@@ -71,6 +74,8 @@ public class LifecycleUtil {
.forEach((id, pack) -> { .forEach((id, pack) -> {
Identifier generatorID = Identifier.of("terra", pack.getID().toLowerCase(Locale.ROOT) + "/" + pack.getNamespace().toLowerCase( Identifier generatorID = Identifier.of("terra", pack.getID().toLowerCase(Locale.ROOT) + "/" + pack.getNamespace().toLowerCase(
Locale.ROOT)); Locale.ROOT));
PRESETS.add(generatorID);
TerraBiomeSource biomeSource = new TerraBiomeSource(biomeRegistry, pack); TerraBiomeSource biomeSource = new TerraBiomeSource(biomeRegistry, pack);
ChunkGenerator generator = new FabricChunkGeneratorWrapper(structureSetRegistry, biomeSource, pack, overworld); ChunkGenerator generator = new FabricChunkGeneratorWrapper(structureSetRegistry, biomeSource, pack, overworld);
@@ -88,4 +93,8 @@ public class LifecycleUtil {
} }
); );
} }
public static List<Identifier> getPresets() {
return PRESETS;
}
} }
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/TagUtil.java
+53 -31
View File
@@ -2,9 +2,11 @@ package com.dfsek.terra.fabric.util;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import net.minecraft.tag.TagKey; import net.minecraft.tag.TagKey;
import net.minecraft.tag.WorldPresetTags;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryEntry; import net.minecraft.util.registry.RegistryEntry;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.WorldPreset;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -30,43 +32,63 @@ public final class TagUtil {
HashMap::putAll); HashMap::putAll);
} }
public static void registerWorldPresetTags(Registry<WorldPreset> registry) {
logger.info("Doing preset tag garbage....");
Map<TagKey<WorldPreset>, List<RegistryEntry<WorldPreset>>> collect = tagsToMutableMap(registry);
LifecycleUtil
.getPresets()
.forEach(id -> FabricUtil
.getEntry(registry, id)
.ifPresentOrElse(
preset -> collect
.computeIfAbsent(WorldPresetTags.NORMAL, tag -> new ArrayList<>())
.add(preset),
() -> logger.error("Preset {} does not exist!", id)));
registry.clearTags();
registry.populateTags(ImmutableMap.copyOf(collect));
}
public static void registerBiomeTags(Registry<Biome> registry) { public static void registerBiomeTags(Registry<Biome> registry) {
logger.info("Doing tag garbage...."); logger.info("Doing biome tag garbage....");
Map<TagKey<Biome>, List<RegistryEntry<Biome>>> collect = tagsToMutableMap(registry); Map<TagKey<Biome>, List<RegistryEntry<Biome>>> collect = tagsToMutableMap(registry);
BiomeUtil BiomeUtil
.getTerraBiomeMap() .getTerraBiomeMap()
.forEach((vb, terraBiomes) -> .forEach((vb, terraBiomes) ->
FabricUtil.getEntry(registry, vb) FabricUtil
.ifPresentOrElse(vanilla -> terraBiomes .getEntry(registry, vb)
.forEach(tb -> FabricUtil .ifPresentOrElse(
.getEntry(registry, tb) vanilla -> terraBiomes
.ifPresentOrElse( .forEach(tb -> FabricUtil
terra -> { .getEntry(registry, tb)
logger.debug( .ifPresentOrElse(
vanilla.getKey() terra -> {
.orElseThrow() logger.debug(
.getValue() + vanilla.getKey()
" (vanilla for " + .orElseThrow()
terra.getKey() .getValue() +
.orElseThrow() " (vanilla for " +
.getValue() + terra.getKey()
": " + .orElseThrow()
vanilla.streamTags() .getValue() +
.toList()); ": " +
vanilla.streamTags()
vanilla.streamTags() .toList());
.forEach(
tag -> collect vanilla.streamTags()
.computeIfAbsent( .forEach(
tag, tag -> collect
t -> new ArrayList<>()) .computeIfAbsent(
.add(terra)); tag,
}, t -> new ArrayList<>())
() -> logger.error( .add(terra));
"No such biome: {}", },
tb))), () -> logger.error(
() -> logger.error("No vanilla biome: {}", vb))); "No such biome: {}",
tb))),
() -> logger.error("No vanilla biome: {}", vb)));
registry.clearTags(); registry.clearTags();
registry.populateTags(ImmutableMap.copyOf(collect)); registry.populateTags(ImmutableMap.copyOf(collect));