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

apply vanilla biome flower feature supplier to terra biomes

Browse Source
This commit is contained in:
dfsek
2022-05-28 16:39:10 -07:00
parent 278ab648dd
commit 0b6b66b7e6
5 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/GenerationSettingsAccessor.java
+21
View File
@@ -0,0 +1,21 @@
package com.dfsek.terra.fabric.mixin.access;
import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.List;
import java.util.function.Supplier;
@Mixin(GenerationSettings.class)
public interface GenerationSettingsAccessor {
@Mutable
@Accessor("flowerFeatures")
void setFlowerFeatures(Supplier<List<ConfiguredFeature<?, ?>>> flowerFeatures);
@Accessor("flowerFeatures")
Supplier<List<ConfiguredFeature<?, ?>>> getFlowerFeaturesSupplier();
}
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
+4 -1
View File
@@ -1,9 +1,11 @@
package com.dfsek.terra.fabric.mixin.lifecycle; package com.dfsek.terra.fabric.mixin.lifecycle;
import com.dfsek.terra.fabric.util.BiomeUtil;
import com.dfsek.terra.fabric.util.TagUtil; import com.dfsek.terra.fabric.util.TagUtil;
import net.minecraft.server.DataPackContents; import net.minecraft.server.DataPackContents;
import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.DynamicRegistryManager;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.world.biome.Biome;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -17,6 +19,7 @@ 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.registerTags(dynamicRegistryManager.get(Registry.BIOME_KEY)); Registry<Biome> biomeRegistry = dynamicRegistryManager.get(Registry.BIOME_KEY);
TagUtil.registerTags(biomeRegistry);
} }
} }
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/BiomeUtil.java
+9 -7
View File
@@ -5,6 +5,7 @@ import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.FabricEntryPoint;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions; import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.fabric.config.VanillaBiomeProperties; import com.dfsek.terra.fabric.config.VanillaBiomeProperties;
import com.dfsek.terra.fabric.mixin.access.GenerationSettingsAccessor;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.BuiltinRegistries;
@@ -16,12 +17,7 @@ import net.minecraft.world.biome.GenerationSettings;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
public final class BiomeUtil { public final class BiomeUtil {
@@ -136,13 +132,19 @@ public final class BiomeUtil {
builder.precipitation(vanilla.getPrecipitation()) builder.precipitation(vanilla.getPrecipitation())
.category(vanilla.getCategory()); .category(vanilla.getCategory());
} }
GenerationSettings settings = generationSettings.build();
((GenerationSettingsAccessor) settings)
.setFlowerFeatures(((GenerationSettingsAccessor) vanilla.getGenerationSettings())
.getFlowerFeaturesSupplier());
return builder return builder
.temperature(vanilla.getTemperature()) .temperature(vanilla.getTemperature())
.downfall(vanilla.getDownfall()) .downfall(vanilla.getDownfall())
.effects(effects.build()) .effects(effects.build())
.spawnSettings(vanilla.getSpawnSettings()) .spawnSettings(vanilla.getSpawnSettings())
.generationSettings(generationSettings.build()) .generationSettings(settings)
.build(); .build();
} }
} }
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/TagUtil.java
+41 -20
View File
@@ -16,6 +16,7 @@ import java.util.Map;
public final class TagUtil { public final class TagUtil {
private static final Logger logger = LoggerFactory.getLogger(TagUtil.class); private static final Logger logger = LoggerFactory.getLogger(TagUtil.class);
private TagUtil() { private TagUtil() {
} }
@@ -29,26 +30,46 @@ public final class TagUtil {
map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())), map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())),
HashMap::putAll); HashMap::putAll);
BiomeUtil.getTerraBiomeMap().forEach((vb, terraBiomes) -> FabricUtil.getEntry(registry, vb) BiomeUtil
.ifPresentOrElse(vanilla -> terraBiomes.forEach(tb -> FabricUtil.getEntry(registry, tb) .getTerraBiomeMap()
.ifPresentOrElse( .forEach((vb, terraBiomes) ->
terra -> { FabricUtil.getEntry(registry, vb)
logger.debug(vanilla.getKey().orElseThrow().getValue() + " (vanilla for " + .ifPresentOrElse(vanilla -> terraBiomes
terra.getKey().orElseThrow().getValue() + ": " + .forEach(tb -> FabricUtil
vanilla.streamTags().toList()); .getEntry(registry, tb)
.ifPresentOrElse(
vanilla.streamTags() terra -> {
.forEach( logger.debug(
tag -> collect vanilla.getKey()
.computeIfAbsent(tag, t -> new ArrayList<>()) .orElseThrow()
.add(FabricUtil.getEntry(registry, .getValue() +
terra.getKey() " (vanilla for " +
.orElseThrow() terra.getKey()
.getValue()).orElseThrow())); .orElseThrow()
.getValue() +
}, ": " +
() -> logger.error("No such biome: {}", tb))), vanilla.streamTags()
() -> logger.error("No vanilla biome: {}", vb))); .toList());
vanilla.streamTags()
.forEach(
tag -> collect
.computeIfAbsent(
tag,
t -> new ArrayList<>())
.add(FabricUtil
.getEntry(
registry,
terra.getKey()
.orElseThrow()
.getValue())
.orElseThrow()));
},
() -> logger.error(
"No such biome: {}",
tb))),
() -> logger.error("No vanilla biome: {}", vb)));
registry.clearTags(); registry.clearTags();
registry.populateTags(ImmutableMap.copyOf(collect)); registry.populateTags(ImmutableMap.copyOf(collect));
platforms/fabric/src/main/resources/terra.mixins.json
+1
View File
@@ -4,6 +4,7 @@
"package": "com.dfsek.terra.fabric.mixin", "package": "com.dfsek.terra.fabric.mixin",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
"access.GenerationSettingsAccessor",
"access.MobSpawnerLogicAccessor", "access.MobSpawnerLogicAccessor",
"access.StateAccessor", "access.StateAccessor",
"access.StructureAccessorAccessor", "access.StructureAccessorAccessor",