mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 00:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

add vanilla biomes option on fabric

Browse Source
This commit is contained in:
dfsek 2022-01-02 00:46:13 -07:00
parent 3dc98a2bc2
commit f7d53c9db3
3 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java
View File

@ -60,25 +60,13 @@ public final class FabricAddon implements BaseAddon {
terraFabricPlugin.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPreLoadEvent.class)
.then(event -> {
try {
event.getPack().getContext().put(event.loadTemplate(new PreLoadCompatibilityOptions()));
} catch(ConfigException e) {
logger.error("Error loading config template", e);
}
})
.then(event -> event.getPack().getContext().put(event.loadTemplate(new PreLoadCompatibilityOptions())))
.global();
terraFabricPlugin.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(this, ConfigPackPostLoadEvent.class)
.then(event -> {
try {
event.getPack().getContext().put(event.loadTemplate(new PostLoadCompatibilityOptions()));
} catch(ConfigException e) {
logger.error("Error loading config template", e);
}
})
.then(event -> event.getPack().getContext().put(event.loadTemplate(new PostLoadCompatibilityOptions())))
.priority(100)
.global();

8
platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PreLoadCompatibilityOptions.java
View File

@ -31,5 +31,11 @@ import java.util.Set;
@SuppressWarnings("FieldMayBeFinal")
public class PreLoadCompatibilityOptions implements ConfigTemplate, Properties {
@Value("fabric.use-vanilla-biomes")
@Default
private boolean vanillaBiomes = false;
public boolean useVanillaBiomes() {
return vanillaBiomes;
}
}

57
platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java
View File

@ -19,6 +19,8 @@ package com.dfsek.terra.fabric.util;
import com.dfsek.terra.fabric.config.BiomeColors;
import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
import com.mojang.serialization.Lifecycle;
import net.minecraft.block.entity.LootableContainerBlockEntity;
import net.minecraft.block.entity.MobSpawnerBlockEntity;
@ -72,52 +74,72 @@ public final class FabricUtil {
com.dfsek.terra.api.registry.key.RegistryKey id) {
Registry<net.minecraft.world.biome.Biome> biomeRegistry = registryManager.get(Registry.BIOME_KEY);
net.minecraft.world.biome.Biome vanilla = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry);
if(pack.getContext().get(PreLoadCompatibilityOptions.class).useVanillaBiomes()) {
((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(vanilla);
} else {
net.minecraft.world.biome.Biome minecraftBiome = createBiome(biome, vanilla);
Identifier identifier = new Identifier("terra", FabricUtil.createBiomeID(pack, id));
if(biomeRegistry.containsId(identifier)) {
((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(biomeRegistry.get(identifier));
} else {
Registry.register(biomeRegistry, identifier, minecraftBiome);
((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(minecraftBiome);
terraVanillaBiomes.computeIfAbsent(biomeRegistry.getKey(vanilla).orElseThrow(), b -> new ArrayList<>()).add(
biomeRegistry.getKey(minecraftBiome).orElseThrow());
}
}
}
public static net.minecraft.world.biome.Biome createBiome(Biome biome, net.minecraft.world.biome.Biome vanilla) {
GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
BiomeEffectsAccessor accessor = (BiomeEffectsAccessor) vanilla.getEffects();
BiomeEffects.Builder effects = new BiomeEffects.Builder()
.grassColorModifier(accessor.getGrassColorModifier());
if(biome.getContext().has(BiomeColors.class)) {
BiomeColors biomeColors = biome.getContext().get(BiomeColors.class);
if(biomeColors.getWaterColor() == null) {
effects.waterColor(vanilla.getWaterColor());
} else {
effects.waterColor(biomeColors.getWaterColor());
}
if(biomeColors.getWaterFogColor() == null) {
effects.waterFogColor(vanilla.getWaterFogColor());
} else {
effects.waterFogColor(biomeColors.getWaterFogColor());
}
if(biomeColors.getFogColor() == null) {
effects.fogColor(vanilla.getFogColor());
} else {
effects.fogColor(biomeColors.getFogColor());
}
if(biomeColors.getSkyColor() == null) {
effects.skyColor(vanilla.getSkyColor());
} else {
effects.skyColor(biomeColors.getSkyColor());
}
if(biomeColors.getGrassColor() == null) {
accessor.getGrassColor().ifPresent(effects::grassColor);
} else {
effects.grassColor(biomeColors.getGrassColor());
}
if(biomeColors.getFoliageColor() == null) {
accessor.getFoliageColor().ifPresent(effects::foliageColor);
} else {
effects.foliageColor(biomeColors.getFoliageColor());
}
} else {
effects.waterColor(accessor.getWaterColor())
.waterFogColor(accessor.getWaterFogColor())
@ -126,8 +148,8 @@ public final class FabricUtil {
accessor.getFoliageColor().ifPresent(effects::foliageColor);
accessor.getGrassColor().ifPresent(effects::grassColor);
}
net.minecraft.world.biome.Biome minecraftBiome = new net.minecraft.world.biome.Biome.Builder()
return new net.minecraft.world.biome.Biome.Builder()
.precipitation(vanilla.getPrecipitation())
.category(vanilla.getCategory())
.temperature(vanilla.getTemperature())
@ -136,17 +158,6 @@ public final class FabricUtil {
.spawnSettings(vanilla.getSpawnSettings())
.generationSettings(generationSettings.build())
.build();
Identifier identifier = new Identifier("terra", FabricUtil.createBiomeID(pack, id));
if(biomeRegistry.containsId(identifier)) {
((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(biomeRegistry.get(identifier));
} else {
Registry.register(biomeRegistry, identifier, minecraftBiome);
((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(minecraftBiome);
terraVanillaBiomes.computeIfAbsent(biomeRegistry.getKey(vanilla).orElseThrow(), b -> new ArrayList<>()).add(
biomeRegistry.getKey(minecraftBiome).orElseThrow());
}
}
public static Map<RegistryKey<net.minecraft.world.biome.Biome>, List<RegistryKey<net.minecraft.world.biome.Biome>>> getTerraVanillaBiomes() {