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

Fixed crash with assume abstract BiomeSources

Browse source
This commit is contained in:
Frank 2022-07-08 17:02:39 +02:00
parent 92ff27f2f8
commit 5fd087d8b7
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java
View file

@ -19,7 +19,7 @@ import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
public abstract class BCLBiomeSource extends BiomeSource implements BiomeSourceWithSeed, MergeableBiomeSource<BCLBiomeSource>, BiomeSourceWithNoiseRelatedSettings, BiomeSourceFromRegistry { public abstract class BCLBiomeSource extends BiomeSource implements BiomeSourceWithSeed, MergeableBiomeSource<BCLBiomeSource>, BiomeSourceWithNoiseRelatedSettings, BiomeSourceFromRegistry<BCLBiomeSource> {
protected final Registry<Biome> biomeRegistry; protected final Registry<Biome> biomeRegistry;
protected long currentSeed; protected long currentSeed;
protected int maxHeight; protected int maxHeight;

10
src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java
View file

@ -3,17 +3,17 @@ package org.betterx.worlds.together.biomesource;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.BiomeSource;
import java.util.Set; import java.util.Set;
public interface BiomeSourceFromRegistry { public interface BiomeSourceFromRegistry<T extends BiomeSource> {
Registry<Biome> getBiomeRegistry(); Registry<Biome> getBiomeRegistry();
Set<Holder<Biome>> possibleBiomes();
default boolean sameRegistryButDifferentBiomes(BiomeSourceFromRegistry other) { default <R extends BiomeSource> boolean sameRegistryButDifferentBiomes(BiomeSourceFromRegistry<R> other) {
if (other.getBiomeRegistry() == getBiomeRegistry()) { if (other.getBiomeRegistry() == getBiomeRegistry()) {
Set<Holder<Biome>> mySet = this.possibleBiomes(); Set<Holder<Biome>> mySet = ((T) this).possibleBiomes();
Set<Holder<Biome>> otherSet = other.possibleBiomes(); Set<Holder<Biome>> otherSet = ((R) other).possibleBiomes();
if (otherSet.size() != mySet.size()) return true; if (otherSet.size() != mySet.size()) return true;
for (Holder<Biome> b : mySet) { for (Holder<Biome> b : mySet) {
if (!otherSet.contains(b)) if (!otherSet.contains(b))