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

remove palette definition from base biome config

Browse Source
This commit is contained in:
dfsek
2021-07-16 12:38:47 -07:00
parent 2e6b62d690
commit 646d8970aa
7 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java
+1 -1
View File
@@ -17,6 +17,6 @@ public final class PaletteUtil {
}
}
return c.getPaletteSettings().getPalette(y);
return paletteInfo.getPaletteHolder().getPalette(y);
}
}
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
+6 -4
View File
@@ -174,8 +174,10 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
TerraWorld terraWorld = main.getWorld(world);
BiomeProvider provider = terraWorld.getBiomeProvider();
TerraBiome biome = provider.getBiome(x, z);
Palette palette = biome.getGenerator(world).getPaletteSettings().getPalette(y);
Sampler sampler = terraWorld.getConfig().getSamplerCache().get(x, z);
PaletteInfo paletteInfo = addon.getPalette(biome);
Palette palette = PaletteUtil.getPalette(x, y, z, biome.getGenerator(world), sampler, paletteInfo);
int fdX = FastMath.floorMod(x, 16);
int fdZ = FastMath.floorMod(z, 16);
double noise = sampler.sample(fdX, y, fdZ);
@@ -186,8 +188,8 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
else level = 0;
}
return palette.get(level, x, y, z);
} /* else if(y <= biome.getConfig().getSeaLevel()) {
return biome.getConfig().getOceanPalette().get(biome.getConfig().getSeaLevel() - y, x, y, z);
} */ else return air;
} else if(y <= paletteInfo.getSeaLevel()) {
return paletteInfo.getOcean().get(paletteInfo.getSeaLevel() - y, x, y, z);
} else return air;
}
}