-
Notifications
You must be signed in to change notification settings - Fork 292
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Simplify Terrablender integration a lot. The Weald now seems to generate
- Loading branch information
Showing
11 changed files
with
148 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 0 additions & 87 deletions
87
src/main/java/org/violetmoon/quark/base/handler/UndergroundBiomeHandler.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
...n/java/org/violetmoon/quark/integration/terrablender/AbstractUndergroundBiomeHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package org.violetmoon.quark.integration.terrablender; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import com.mojang.datafixers.util.Pair; | ||
| import net.minecraft.core.registries.Registries; | ||
| import net.minecraft.resources.ResourceKey; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.level.biome.Biome; | ||
| import net.minecraft.world.level.biome.Climate; | ||
| import net.minecraft.world.level.biome.OverworldBiomeBuilder; | ||
| import org.violetmoon.zeta.module.ZetaModule; | ||
|
|
||
| public abstract class AbstractUndergroundBiomeHandler { | ||
|
|
||
| protected List<UndergroundBiomeDesc> undergroundBiomeDescs = new ArrayList<>(2); | ||
|
|
||
| public void registerUndergroundBiome(ZetaModule module, ResourceLocation id, Climate.ParameterPoint climate) { | ||
| registerUndergroundBiome(new UndergroundBiomeDesc(module, id, climate)); | ||
| } | ||
|
|
||
| public void registerUndergroundBiome(UndergroundBiomeDesc desc) { | ||
| undergroundBiomeDescs.add(desc); | ||
| } | ||
|
|
||
| protected void addUndergroundBiomesTo(Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> consumer) { | ||
| for(UndergroundBiomeDesc desc : undergroundBiomeDescs) | ||
| if(desc.module().enabled) | ||
| consumer.accept(Pair.of(desc.climateParameterPoint(), desc.resourceKey())); | ||
| } | ||
|
|
||
| /** | ||
| * This gets hooked up to the vanilla method OverworldBiomeBuilder#addUndergroundBiomes. | ||
| * Calling the Consumer will effectively, add biomes to the `minecraft:overworld` MultiNoiseBiomeSourceParameterList.Preset. | ||
| */ | ||
| public abstract void modifyVanillaOverworldPreset(OverworldBiomeBuilder builder, Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> consumer); | ||
|
|
||
| public record UndergroundBiomeDesc(ZetaModule module, ResourceLocation id, Climate.ParameterPoint climateParameterPoint) { | ||
| public ResourceKey<Biome> resourceKey() { | ||
| return ResourceKey.create(Registries.BIOME, id); | ||
| } | ||
| } | ||
| } |
82 changes: 0 additions & 82 deletions
82
src/main/java/org/violetmoon/quark/integration/terrablender/TerraBlenderIntegration.java
This file was deleted.
Oops, something went wrong.
58 changes: 58 additions & 0 deletions
58
...va/org/violetmoon/quark/integration/terrablender/TerrablenderUndergroundBiomeHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package org.violetmoon.quark.integration.terrablender; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| import com.mojang.datafixers.util.Pair; | ||
| import net.minecraft.core.Registry; | ||
| import net.minecraft.resources.ResourceKey; | ||
| import net.minecraft.world.level.biome.Biome; | ||
| import net.minecraft.world.level.biome.Climate; | ||
| import net.minecraft.world.level.biome.OverworldBiomeBuilder; | ||
| import org.violetmoon.quark.base.Quark; | ||
| import org.violetmoon.quark.base.handler.GeneralConfig; | ||
| import org.violetmoon.zeta.event.bus.LoadEvent; | ||
| import org.violetmoon.zeta.event.load.ZCommonSetup; | ||
| import terrablender.api.Region; | ||
| import terrablender.api.RegionType; | ||
| import terrablender.api.Regions; | ||
|
|
||
| public class TerrablenderUndergroundBiomeHandler extends AbstractUndergroundBiomeHandler { | ||
|
|
||
| public TerrablenderUndergroundBiomeHandler() { | ||
| Quark.LOG.info("Initializing TerraBlender underground biome compat"); | ||
| Quark.ZETA.loadBus.subscribe(this); | ||
| } | ||
|
|
||
| @LoadEvent | ||
| public void commonSetup(ZCommonSetup event) { | ||
| event.enqueueWork(() -> { | ||
| if(undergroundBiomeDescs.isEmpty() || GeneralConfig.terrablenderAddRegion) | ||
| return; // No need to register a region. | ||
|
|
||
| Regions.register(new Region(Quark.asResource("biome_provider"), RegionType.OVERWORLD, GeneralConfig.terrablenderRegionWeight) { | ||
| @Override | ||
| public void addBiomes(Registry<Biome> registry, Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> consumer) { | ||
| // Quark's region is the same as vanilla's, but with underground biomes added. | ||
| addModifiedVanillaOverworldBiomes(consumer, noModifications -> { }); | ||
|
|
||
| // When we call TerraBlender's addModifiedVanillaOverworldBiomes... | ||
| // -> it calls terrablender ModifiedVanillaOverworldBuilder.build | ||
| // -> it calls vanilla OverworldBiomeBuilder.addBiomes | ||
| // -> it calls vanilla OverworldBiomeBuilder.addUndergroundBiomes | ||
| // -> it gets hooked by Quark's OverworldBiomeBuilderMixin | ||
| // -> it calls quark AbstractUndergroundBiomeHandler.modifyVanillaOverworldPreset. | ||
| // Therefore, if terrablenderModifyVanillaAnyway is enabled, we already called addUndergroundBiomesTo. | ||
| if(!GeneralConfig.terrablenderModifyVanillaAnyway) | ||
| addUndergroundBiomesTo(consumer); | ||
| } | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void modifyVanillaOverworldPreset(OverworldBiomeBuilder builder, Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> consumer) { | ||
| if(GeneralConfig.terrablenderModifyVanillaAnyway) | ||
| addUndergroundBiomesTo(consumer); | ||
| } | ||
|
|
||
| } |
18 changes: 18 additions & 0 deletions
18
...in/java/org/violetmoon/quark/integration/terrablender/VanillaUndergroundBiomeHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package org.violetmoon.quark.integration.terrablender; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| import com.mojang.datafixers.util.Pair; | ||
| import net.minecraft.resources.ResourceKey; | ||
| import net.minecraft.world.level.biome.Biome; | ||
| import net.minecraft.world.level.biome.Climate; | ||
| import net.minecraft.world.level.biome.OverworldBiomeBuilder; | ||
|
|
||
| public class VanillaUndergroundBiomeHandler extends AbstractUndergroundBiomeHandler { | ||
|
|
||
| @Override | ||
| public void modifyVanillaOverworldPreset(OverworldBiomeBuilder builder, Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> consumer) { | ||
| addUndergroundBiomesTo(consumer); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.