Small Changes to Surface/Biome API
This commit is contained in:
Frank
parent
b8b12623bf
commit
54b55be51a
5 changed files with 23 additions and 62 deletions
336
src/main/java/org/betterx/bclib/api/biomes/BCLBiome.java
Normal file
336
src/main/java/org/betterx/bclib/api/biomes/BCLBiome.java
Normal file
|
|
@ -0,0 +1,336 @@
|
|||
package org.betterx.bclib.api.biomes;
|
||||
|
||||
import net.minecraft.data.BuiltinRegistries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.biome.Climate;
|
||||
import net.minecraft.world.level.levelgen.SurfaceRules;
|
||||
import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource;
|
||||
import net.minecraft.world.level.levelgen.WorldgenRandom;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import org.betterx.bclib.BCLib;
|
||||
import org.betterx.bclib.api.surface.SurfaceRuleUtil;
|
||||
import org.betterx.bclib.api.tag.TagAPI;
|
||||
import org.betterx.bclib.util.WeightedList;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.Consumer;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class BCLBiome extends BCLBiomeSettings {
|
||||
private final Set<TagKey<Biome>> structureTags = Sets.newHashSet();
|
||||
private final WeightedList<BCLBiome> subbiomes = new WeightedList<>();
|
||||
private final Map<String, Object> customData = Maps.newHashMap();
|
||||
private final ResourceLocation biomeID;
|
||||
private final Biome biome;
|
||||
|
||||
private final List<Climate.ParameterPoint> parameterPoints = Lists.newArrayList();
|
||||
|
||||
private Consumer<ResourceKey<Biome>> surfaceInit;
|
||||
private BCLBiome biomeParent;
|
||||
|
||||
/**
|
||||
* Create wrapper for existing biome using its {@link ResourceLocation} identifier.
|
||||
*
|
||||
* @param biomeKey {@link ResourceKey} for the {@link Biome}.
|
||||
*/
|
||||
protected BCLBiome(ResourceKey<Biome> biomeKey) {
|
||||
this(biomeKey.location());
|
||||
}
|
||||
|
||||
/**
|
||||
* Create wrapper for existing biome using its {@link ResourceLocation} identifier.
|
||||
*
|
||||
* @param biomeID {@link ResourceLocation} biome ID.
|
||||
*/
|
||||
protected BCLBiome(ResourceLocation biomeID) {
|
||||
this(biomeID, BuiltinRegistries.BIOME.get(biomeID), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create wrapper for existing biome using biome instance from {@link BuiltinRegistries}.
|
||||
*
|
||||
* @param biome {@link Biome} to wrap.
|
||||
*/
|
||||
protected BCLBiome(Biome biome) {
|
||||
this(biome, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create wrapper for existing biome using biome instance from {@link BuiltinRegistries}.
|
||||
*
|
||||
* @param biome {@link Biome} to wrap.
|
||||
* @param settings The Settings for this Biome or {@code null} if you want to apply default settings
|
||||
*/
|
||||
protected BCLBiome(Biome biome, VanillaBiomeSettings settings) {
|
||||
this(BiomeAPI.getBiomeID(biome), biome, settings);
|
||||
}
|
||||
|
||||
public BCLBiome(ResourceLocation biomeID, Biome biome) {
|
||||
this(biomeID, biome, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new Biome
|
||||
*
|
||||
* @param biomeID {@link ResourceLocation} biome ID.
|
||||
* @param biome {@link Biome} to wrap.
|
||||
* @param defaults The Settings for this Biome or null if you want to apply the defaults
|
||||
*/
|
||||
protected BCLBiome(ResourceLocation biomeID, Biome biome, BCLBiomeSettings defaults) {
|
||||
this.subbiomes.add(this, 1.0F);
|
||||
this.biomeID = biomeID;
|
||||
this.biome = biome;
|
||||
|
||||
if (defaults != null) {
|
||||
defaults.applyWithDefaults(this);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get current biome edge.
|
||||
*
|
||||
* @return {@link BCLBiome} edge.
|
||||
*/
|
||||
@Nullable
|
||||
public BCLBiome getEdge() {
|
||||
return edge;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set biome edge for this biome instance.
|
||||
*
|
||||
* @param edge {@link BCLBiome} as the edge biome.
|
||||
* @return same {@link BCLBiome}.
|
||||
*/
|
||||
BCLBiome setEdge(BCLBiome edge) {
|
||||
this.edge = edge;
|
||||
edge.biomeParent = this;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds sub-biome into this biome instance. Biome chance will be interpreted as a sub-biome generation chance.
|
||||
* Biome itself has chance 1.0 compared to all its sub-biomes.
|
||||
*
|
||||
* @param biome {@link Random} to be added.
|
||||
* @return same {@link BCLBiome}.
|
||||
*/
|
||||
public BCLBiome addSubBiome(BCLBiome biome) {
|
||||
biome.biomeParent = this;
|
||||
subbiomes.add(biome, biome.getGenChance());
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if specified biome is a sub-biome of this one.
|
||||
*
|
||||
* @param biome {@link Random}.
|
||||
* @return true if this instance contains specified biome as a sub-biome.
|
||||
*/
|
||||
public boolean containsSubBiome(BCLBiome biome) {
|
||||
return subbiomes.contains(biome);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for a random sub-biome from all existing sub-biomes. Will return biome itself if there are no sub-biomes.
|
||||
*
|
||||
* @param random {@link Random}.
|
||||
* @return {@link BCLBiome}.
|
||||
*/
|
||||
public BCLBiome getSubBiome(WorldgenRandom random) {
|
||||
return subbiomes.get(random);
|
||||
}
|
||||
|
||||
public void forEachSubBiome(BiConsumer<BCLBiome, Float> consumer) {
|
||||
for (int i = 0; i < subbiomes.size(); i++)
|
||||
consumer.accept(subbiomes.get(i), subbiomes.getWeight(i));
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for parent {@link BCLBiome} or null if there are no parent biome.
|
||||
*
|
||||
* @return {@link BCLBiome} or null.
|
||||
*/
|
||||
@Nullable
|
||||
public BCLBiome getParentBiome() {
|
||||
return this.biomeParent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares biome instances (directly) and their parents. Used in custom world generator.
|
||||
*
|
||||
* @param biome {@link BCLBiome}
|
||||
* @return true if biome or its parent is same.
|
||||
*/
|
||||
public boolean isSame(BCLBiome biome) {
|
||||
return biome == this || (biome.biomeParent != null && biome.biomeParent == this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for biome identifier.
|
||||
*
|
||||
* @return {@link ResourceLocation}
|
||||
*/
|
||||
public ResourceLocation getID() {
|
||||
return biomeID;
|
||||
}
|
||||
|
||||
|
||||
public Holder<Biome> getBiomeHolder() {
|
||||
return BuiltinRegistries.BIOME.getOrCreateHolderOrThrow(BiomeAPI.getBiomeKey(biome));
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for biome from buil-in registry. For datapack biomes will be same as actual biome.
|
||||
*
|
||||
* @return {@link Biome}.
|
||||
*/
|
||||
public Biome getBiome() {
|
||||
return biome;
|
||||
}
|
||||
|
||||
/**
|
||||
* For internal use from BiomeAPI only
|
||||
*/
|
||||
void afterRegistration() {
|
||||
ResourceKey<Biome> key = BuiltinRegistries.BIOME.getResourceKey(getBiome()).orElseThrow();
|
||||
this.structureTags.forEach(tagKey -> TagAPI.addBiomeTag(tagKey, biome));
|
||||
|
||||
if (this.surfaceInit != null) {
|
||||
surfaceInit.accept(key);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Getter for custom data. Will get custom data object or null if object doesn't exists.
|
||||
*
|
||||
* @param name {@link String} name of data object.
|
||||
* @return object value or null.
|
||||
*/
|
||||
@Nullable
|
||||
@SuppressWarnings("unchecked")
|
||||
@Deprecated(forRemoval = true)
|
||||
public <T> T getCustomData(String name) {
|
||||
return (T) customData.get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for custom data. Will get custom data object or default value if object doesn't exists.
|
||||
*
|
||||
* @param name {@link String} name of data object.
|
||||
* @param defaultValue object default value.
|
||||
* @return object value or default value.
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
@Deprecated(forRemoval = true)
|
||||
public <T> T getCustomData(String name, T defaultValue) {
|
||||
return (T) customData.getOrDefault(name, defaultValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds custom data object to this biome instance.
|
||||
*
|
||||
* @param name {@link String} name of data object.
|
||||
* @param obj any data to add.
|
||||
* @return same {@link BCLBiome}.
|
||||
*/
|
||||
public BCLBiome addCustomData(String name, Object obj) {
|
||||
customData.put(name, obj);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds custom data object to this biome instance.
|
||||
*
|
||||
* @param data a {@link Map} with custom data.
|
||||
* @return same {@link BCLBiome}.
|
||||
*/
|
||||
public BCLBiome addCustomData(Map<String, Object> data) {
|
||||
customData.putAll(data);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj == this) {
|
||||
return true;
|
||||
}
|
||||
BCLBiome biome = (BCLBiome) obj;
|
||||
return biome != null && biomeID.equals(biome.biomeID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return biomeID.hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return biomeID.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds structures to this biome. For internal use only.
|
||||
* Used inside {@link BCLBiomeBuilder}.
|
||||
*/
|
||||
void attachStructures(List<TagKey<Biome>> structures) {
|
||||
structureTags.addAll(structures);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds structures to this biome. For internal use only.
|
||||
* Used inside {@link BCLBiomeBuilder}.
|
||||
*/
|
||||
void addClimateParameters(List<Climate.ParameterPoint> params) {
|
||||
this.parameterPoints.addAll(params);
|
||||
}
|
||||
|
||||
public void forEachClimateParameter(Consumer<Climate.ParameterPoint> consumer) {
|
||||
this.parameterPoints.forEach(consumer);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets biome surface rule.
|
||||
*
|
||||
* @param surface {@link SurfaceRules.RuleSource} rule.
|
||||
*/
|
||||
void setSurface(RuleSource surface) {
|
||||
this.surfaceInit = (key) -> {
|
||||
if (key == null) {
|
||||
BCLib.LOGGER.warning("BCL Biome " + biomeID + " does not have registry key!");
|
||||
} else {
|
||||
SurfaceRuleUtil.addSurfaceRule(biomeID, SurfaceRules.ifTrue(SurfaceRules.isBiome(key), surface));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the group used in the config Files for this biome
|
||||
* <p>
|
||||
* Example: {@code Configs.BIOMES_CONFIG.getFloat(configGroup(), "generation_chance", 1.0);}
|
||||
*
|
||||
* @return The group name
|
||||
*/
|
||||
public String configGroup() {
|
||||
return biomeID.getNamespace() + "." + biomeID.getPath();
|
||||
}
|
||||
|
||||
private final boolean didLoadConfig = false;
|
||||
|
||||
public boolean isEdgeBiome() {
|
||||
if (getParentBiome() == null) return false;
|
||||
return getParentBiome().edge == this;
|
||||
}
|
||||
|
||||
boolean allowFabricRegistration() {
|
||||
return !isEdgeBiome();
|
||||
}
|
||||
}
|
||||
|
|
@ -73,7 +73,6 @@ public class SurfaceRuleUtil {
|
|||
*/
|
||||
public static void addSurfaceRule(ResourceLocation biomeID, RuleSource source) {
|
||||
SURFACE_RULES.put(biomeID, source);
|
||||
//NOISE_GENERATOR_SETTINGS.forEach(BiomeAPI::changeSurfaceRulesForGenerator);
|
||||
}
|
||||
|
||||
public static RuleSource addRulesForBiomeSource(RuleSource org, BiomeSource biomeSource) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue