MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor APi change

Browse source
This commit is contained in:
Frank 2022-12-03 11:35:05 +01:00
parent 67985322bb
commit 78c1df618a
2 changed files with 78 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java
View file

@ -50,73 +50,6 @@ import java.util.function.Function;
public class BCLBiomeBuilder {
public static class UnregisteredBCLBiome<T extends BCLBiome> extends BCLBiomeContainer<T> {
private final BCLBiome parentBiome;
private final BuildCompletion supplier;
private UnregisteredBCLBiome(T biome, BCLBiome parentBiome, BuildCompletion supplier) {
super(biome);
this.parentBiome = parentBiome;
this.supplier = supplier;
}
@Override
public BCLBiomeContainer<T> register(BootstapContext<Biome> bootstrapContext, BiomeAPI.BiomeType dim) {
if (dim == null) dim = BiomeAPI.BiomeType.NONE;
biome._setBiomeToRegister(this.supplier.apply(bootstrapContext));
if (dim.is(BiomeAPI.BiomeType.END_LAND)) {
BiomeAPI.registerEndLandBiome(bootstrapContext, biome);
} else if (dim.is(BiomeAPI.BiomeType.END_VOID)) {
BiomeAPI.registerEndVoidBiome(bootstrapContext, biome);
} else if (dim.is(BiomeAPI.BiomeType.END_BARRENS)) {
BiomeAPI.registerEndBarrensBiome(bootstrapContext, parentBiome, biome);
} else if (dim.is(BiomeAPI.BiomeType.END_CENTER)) {
BiomeAPI.registerEndCenterBiome(bootstrapContext, biome);
} else if (dim.is(BiomeAPI.BiomeType.NETHER)) {
BiomeAPI.registerNetherBiome(bootstrapContext, biome);
} else if (hasParent()) {
BiomeAPI.registerSubBiome(bootstrapContext, parentBiome, biome, dim);
} else {
BiomeAPI.registerBuiltinBiomeAndOverrideIntendedDimension(bootstrapContext, biome, dim);
}
return new BCLBiomeContainer<>(this.biome);
}
public T biome() {
return biome;
}
public boolean hasParent() {
return parentBiome != null;
}
public BCLBiome parentBiome() {
return parentBiome;
}
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
if (obj == null || obj.getClass() != this.getClass()) return false;
UnregisteredBCLBiome<?> that = (UnregisteredBCLBiome<?>) obj;
return Objects.equals(this.biome, that.biome);
}
@Override
public int hashCode() {
return Objects.hash(biome);
}
@Override
public String toString() {
return "UnregisteredBiome[" + "biome=" + biome + ']';
}
}
@FunctionalInterface
public interface BiomeSupplier<T> extends BiFunction<ResourceKey<Biome>, BCLBiomeSettings, T> {
}
@ -126,7 +59,7 @@ public class BCLBiomeBuilder {
}
@FunctionalInterface
private interface BuildCompletion extends Function<BootstapContext<Biome>, Biome> {
interface BuildCompletion extends Function<BootstapContext<Biome>, Biome> {
}
private static final SurfaceRules.ConditionSource SURFACE_NOISE = SurfaceRules.noiseCondition(
@ -943,7 +876,7 @@ public class BCLBiomeBuilder {
*
* @return created {@link BCLBiome} instance.
*/
public UnregisteredBCLBiome<BCLBiome> build() {
public BCLBiomeContainer<BCLBiome> build() {
return build(BCLBiome::new);
}
@ -954,7 +887,7 @@ public class BCLBiomeBuilder {
* @param biomeConstructor {@link BiomeSupplier} biome constructor.
* @return created {@link BCLBiome} instance.
*/
public <T extends BCLBiome> UnregisteredBCLBiome<T> build(BiomeSupplier<T> biomeConstructor) {
public <T extends BCLBiome> BCLBiomeContainer<T> build(BiomeSupplier<T> biomeConstructor) {
BCLBiomeSettings settings = BCLBiomeSettings.createBCL()
.setTerrainHeight(height)
.setFogDensity(fogDensity)
@ -983,7 +916,7 @@ public class BCLBiomeBuilder {
//res.setSurface(surfaceRule);
//carvers.forEach(cfg -> BiomeAPI.addBiomeCarver(biome, cfg.second, cfg.first));
return new UnregisteredBCLBiome<>(
return new UnboundBCLBiome<>(
res,
parent,
ctx -> {

74
src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/UnboundBCLBiome.java Normal file
View file

@ -0,0 +1,74 @@
package org.betterx.bclib.api.v2.levelgen.biomes;
import net.minecraft.data.worldgen.BootstapContext;
import net.minecraft.world.level.biome.Biome;
import java.util.Objects;
class UnboundBCLBiome<T extends BCLBiome> extends BCLBiomeContainer<T> {
private final BCLBiome parentBiome;
private final BCLBiomeBuilder.BuildCompletion supplier;
UnboundBCLBiome(T biome, BCLBiome parentBiome, BCLBiomeBuilder.BuildCompletion supplier) {
super(biome);
this.parentBiome = parentBiome;
this.supplier = supplier;
}
@Override
public BCLBiomeContainer<T> register(BootstapContext<Biome> bootstrapContext, BiomeAPI.BiomeType dim) {
if (dim == null) dim = BiomeAPI.BiomeType.NONE;
biome._setBiomeToRegister(this.supplier.apply(bootstrapContext));
if (dim.is(BiomeAPI.BiomeType.END_LAND)) {
BiomeAPI.registerEndLandBiome(bootstrapContext, biome);
} else if (dim.is(BiomeAPI.BiomeType.END_VOID)) {
BiomeAPI.registerEndVoidBiome(bootstrapContext, biome);
} else if (dim.is(BiomeAPI.BiomeType.END_BARRENS)) {
BiomeAPI.registerEndBarrensBiome(bootstrapContext, parentBiome, biome);
} else if (dim.is(BiomeAPI.BiomeType.END_CENTER)) {
BiomeAPI.registerEndCenterBiome(bootstrapContext, biome);
} else if (dim.is(BiomeAPI.BiomeType.NETHER)) {
BiomeAPI.registerNetherBiome(bootstrapContext, biome);
} else if (hasParent()) {
BiomeAPI.registerSubBiome(bootstrapContext, parentBiome, biome, dim);
} else {
BiomeAPI.registerBuiltinBiomeAndOverrideIntendedDimension(bootstrapContext, biome, dim);
}
return new BCLBiomeContainer<>(this.biome);
}
@Override
public T biome() {
return biome;
}
public boolean hasParent() {
return parentBiome != null;
}
public BCLBiome parentBiome() {
return parentBiome;
}
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
if (obj == null || obj.getClass() != this.getClass()) return false;
UnboundBCLBiome<?> that = (UnboundBCLBiome<?>) obj;
return Objects.equals(this.biome, that.biome);
}
@Override
public int hashCode() {
return Objects.hash(biome);
}
@Override
public String toString() {
return "UnregisteredBiome[" + "biome=" + biome + ']';
}
}