Updated biomeList

LudoCrypt · Nov 16, 2020 · 8b36e3a · 8b36e3a
1 parent 2f1f1ad
commit 8b36e3a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 56 deletions.
diff --git a/src/main/java/net/ludocrypt/perorate/util/BiomeList.java b/src/main/java/net/ludocrypt/perorate/util/BiomeList.java
@@ -0,0 +1,33 @@
+package net.ludocrypt.perorate.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.function.Supplier;
+
+import com.mojang.datafixers.util.Pair;
+
+import net.fabricmc.fabric.mixin.biome.MultiNoiseBiomeSourceAccessor;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.Biome.MixedNoisePoint;
+import net.minecraft.world.biome.source.MultiNoiseBiomeSource;
+
+public class BiomeList<E> extends ArrayList<E> {
+
+	private static final long serialVersionUID = -4413563891178735978L;
+
+	public BiomeList<Biome> addStream(Iterator<Pair<MixedNoisePoint, Supplier<Biome>>> iterator) {
+		BiomeList<Biome> list = new BiomeList<Biome>();
+
+		iterator.forEachRemaining((pair) -> {
+			Supplier<Biome> supplier = pair.getSecond();
+			list.add(supplier.get());
+		});
+
+		return list;
+	}
+
+	public BiomeList<Biome> addFromMultiNoiseESource(MultiNoiseBiomeSource source) {
+		return addStream(((MultiNoiseBiomeSourceAccessor) source).getBiomePoints().iterator());
+	}
+
+}
diff --git a/src/main/java/net/ludocrypt/perorate/util/ListReturnableList.java b/src/main/java/net/ludocrypt/perorate/util/ListReturnableList.java
diff --git a/src/main/java/net/ludocrypt/perorate/world/EndMultiNoiseBiomeSource.java b/src/main/java/net/ludocrypt/perorate/world/EndMultiNoiseBiomeSource.java
@@ -5,7 +5,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.ludocrypt.perorate.util.ListReturnableList;
+import net.ludocrypt.perorate.util.BiomeList;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.noise.SimplexNoiseSampler;
 import net.minecraft.world.biome.Biome;
@@ -40,7 +40,7 @@ public class EndMultiNoiseBiomeSource extends BiomeSource {
 	private final MultiNoiseBiomeSource barrensBiome;
 
 	public EndMultiNoiseBiomeSource(long seed, MultiNoiseBiomeSource centerBiome, MultiNoiseBiomeSource highlandsBiome, MultiNoiseBiomeSource midlandsBiome, MultiNoiseBiomeSource smallIslandsBiome, MultiNoiseBiomeSource barrensBiome) {
-		super(new ListReturnableList<Biome>().addFromMultiNoiseESource(centerBiome).addFromMultiNoiseESource(highlandsBiome).addFromMultiNoiseESource(midlandsBiome).addFromMultiNoiseESource(smallIslandsBiome).addFromMultiNoiseESource(barrensBiome));
+		super(new BiomeList<Biome>().addFromMultiNoiseESource(centerBiome).addFromMultiNoiseESource(highlandsBiome).addFromMultiNoiseESource(midlandsBiome).addFromMultiNoiseESource(smallIslandsBiome).addFromMultiNoiseESource(barrensBiome));
 		this.seed = seed;
 		this.centerBiome = centerBiome;
 		this.highlandsBiome = highlandsBiome;