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

remove unneeded specialised column impl

Browse Source
This commit is contained in:
dfsek 2022-06-14 18:56:51 -07:00
parent eac8d3b4e8
commit 61a40b4825
4 changed files with 2 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/BiomeExtrusionProvider.java
View File

@ -61,9 +61,4 @@ public class BiomeExtrusionProvider implements BiomeProvider {
public BiomeProvider getDelegate() {
return delegate;
}
@Override
public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
return new ExtrusionColumn(min, max, this, x, z, seed);
}
}

76
common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/ExtrusionColumn.java
View File

@ -1,76 +0,0 @@
package com.dfsek.terra.addons.biome.extrusion;
import com.dfsek.terra.api.util.Column;
import com.dfsek.terra.api.util.function.IntIntObjConsumer;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.info.WorldProperties;
public class ExtrusionColumn implements Column<Biome> {
private final int min;
private final int max;
private final BiomeExtrusionProvider provider;
private final int x, z;
private final long seed;
private final Column<Biome> delegate;
public ExtrusionColumn(int min, int max, BiomeExtrusionProvider provider, int x, int z, long seed) {
this.min = min;
this.max = max;
this.provider = provider;
this.x = x;
this.z = z;
this.seed = seed;
this.delegate = provider.getDelegate().getColumn(x, z, seed, min, max);
}
@Override
public int getMinY() {
return min;
}
@Override
public int getMaxY() {
return max;
}
@Override
public int getX() {
return x;
}
@Override
public int getZ() {
return z;
}
@Override
public Biome get(int y) {
return provider.getBiome(x, y, z, seed, delegate.get(y));
}
@Override
public void forRanges(IntIntObjConsumer<Biome> consumer) {
int min = getMinY();
int y = min;
Biome runningObj = get(y);
int runningMin = min;
int max = getMaxY() - 1;
while(y < max) {
y += provider.getResolution();
Biome current = get(y);
if(!current.equals(runningObj)) {
consumer.accept(runningMin, y, runningObj);
runningMin = y;
runningObj = current;
}
}
consumer.accept(runningMin, ++y, runningObj);
}
}

2
common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java
View File

@ -53,7 +53,7 @@ public class CachingBiomeProvider implements BiomeProvider, Handle {
@Override
public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
return columnCache.computeIfAbsent(MathUtil.squash(x, z), k -> delegate.getColumn(x, z, seed, min, max));
return columnCache.computeIfAbsent(MathUtil.squash(x, z), k -> new BiomeColumn(this, min, max, x, z, seed));
}
@Override

2
common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/ChunkLocalCachingBiomeProvider.java
View File

@ -75,7 +75,7 @@ public class ChunkLocalCachingBiomeProvider extends CachingBiomeProvider {
int index = (x & 15) + (16 * (z & 15));
Column<Biome> column = columnCache[index];
if(column == null) {
column = delegate.getColumn(x, z, seed, min, max);
column = new BiomeColumn(this, min, max, x, z, seed);
columnCache[index] = column;
}
return column;