mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 02:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP Random Changes

Browse Source
This commit is contained in:
Zoë Gidiere
2023-12-12 15:57:04 -07:00
parent 033181d7c8
commit a9f973cae9
28 changed files with 208 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java
View File

@@ -10,7 +10,7 @@ package com.dfsek.terra.api.structure;
import org.jetbrains.annotations.ApiStatus.Experimental;
import java.util.List;
import java.util.Random;
import java.util.random.RandomGenerator;
import com.dfsek.terra.api.inventory.Inventory;
import com.dfsek.terra.api.inventory.ItemStack;
@@ -22,16 +22,16 @@ public interface LootTable {
* Fills an Inventory with loot.
*
* @param i The Inventory to fill.
* @param r The The Random instance to use.
* @param r The The RandomGenerator instance to use.
*/
void fillInventory(Inventory i, Random r);
void fillInventory(Inventory i, RandomGenerator r);
/**
* Fetches a list of ItemStacks from the loot table using the given Random instance.
* Fetches a list of ItemStacks from the loot table using the given RandomGenerator instance.
*
* @param r The Random instance to use.
* @param r The RandomGenerator instance to use.
*
* @return List<ItemStack> - The list of loot fetched.
*/
List<ItemStack> getLoot(Random r);
List<ItemStack> getLoot(RandomGenerator r);
}

4
common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java
View File

@@ -7,7 +7,7 @@
package com.dfsek.terra.api.structure;
import java.util.Random;
import java.util.random.RandomGenerator;
import com.dfsek.terra.api.util.Rotation;
import com.dfsek.terra.api.util.vector.Vector3Int;
@@ -15,5 +15,5 @@ import com.dfsek.terra.api.world.WritableWorld;
public interface Structure {
boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation);
boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation);
}

4
common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java
View File

@@ -10,7 +10,7 @@ package com.dfsek.terra.api.util;
import org.jetbrains.annotations.NotNull;
import java.util.Iterator;
import java.util.Random;
import java.util.random.RandomGenerator;
public class ConstantRange implements Range {
@@ -36,7 +36,7 @@ public class ConstantRange implements Range {
}
@Override
public int get(Random r) {
public int get(RandomGenerator r) {
return r.nextInt(min, max);
}

14
common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java
View File

@@ -7,18 +7,20 @@
package com.dfsek.terra.api.util;
import java.util.Random;
import java.util.random.RandomGenerator;
import java.util.random.RandomGeneratorFactory;
import com.dfsek.terra.api.world.chunk.Chunk;
public final class PopulationUtil {
public static Random getRandom(Chunk c) {
public static RandomGenerator getRandom(Chunk c) {
return getRandom(c, 0);
}
public static Random getRandom(Chunk c, long salt) {
return new Random(getCarverChunkSeed(c.getX(), c.getZ(), c.getWorld().getSeed() + salt));
public static RandomGenerator getRandom(Chunk c, long salt) {
return RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(
getCarverChunkSeed(c.getX(), c.getZ(), c.getWorld().getSeed() + salt));
}
/**
@@ -31,7 +33,7 @@ public final class PopulationUtil {
* @return long - The carver seed.
*/
public static long getCarverChunkSeed(int chunkX, int chunkZ, long seed) {
Random r = new Random(seed);
RandomGenerator r = RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(seed);
return chunkX * r.nextLong() ^ chunkZ * r.nextLong() ^ seed;
}
}

8
common/api/src/main/java/com/dfsek/terra/api/util/Range.java
View File

@@ -10,17 +10,17 @@ package com.dfsek.terra.api.util;
import org.jetbrains.annotations.NotNull;
import java.util.Iterator;
import java.util.Random;
import java.util.function.Supplier;
import java.util.random.RandomGenerator;
public interface Range extends Iterable<Integer> {
Range multiply(int mult);
Range reflect(int pt);
int get(Random r);
int get(RandomGenerator r);
Range intersects(Range other);
Range add(int add);

6
common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java
View File

@@ -15,9 +15,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import java.util.random.RandomGenerator;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.MathUtil;
@@ -43,7 +43,7 @@ public class ProbabilityCollection<E> implements Collection<E> {
}
@SuppressWarnings("unchecked")
public E get(Random r) {
public E get(RandomGenerator r) {
if(array.length == 0) return null;
return (E) array[r.nextInt(array.length)];
}
@@ -197,7 +197,7 @@ public class ProbabilityCollection<E> implements Collection<E> {
}
@Override
public T get(Random r) {
public T get(RandomGenerator r) {
return single;
}