Skip to content

Commit

Permalink
还是有一点问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tesseract4D
Tesseract4D committed Aug 24, 2024
1 parent 2d2a535 commit 369976b
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 78 deletions.
30 changes: 12 additions & 18 deletions src/main/java/mods/tesseract/worleycaves/config/Configs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,27 @@

public class Configs
{
public static ConfigCaveGen cavegen = new ConfigCaveGen();
public static double noiseCutoffValue = -0.18;

public static class ConfigCaveGen
{
public static double surfaceCutoffValue = -0.081;

public double noiseCutoffValue = -0.18;
public static double warpAmplifier = 8.0;

public double surfaceCutoffValue = -0.081;
public static int easeInDepth = 15;

public double warpAmplifier = 8.0;
public static double verticalCompressionMultiplier = 2.0;

public int easeInDepth = 15;
public static double horizonalCompressionMultiplier = 1.0;

public double verticalCompressionMultiplier = 2.0;
public static int[] blackListedDims = {};

public double horizonalCompressionMultiplier = 1.0;
public static int maxCaveHeight = 128;

public int[] blackListedDims = {};
public static int minCaveHeight = 1;

public int maxCaveHeight = 128;
public static String lavaBlock = "minecraft:lava";

public int minCaveHeight = 1;
public static int lavaDepth = 10;

public String lavaBlock = "minecraft:lava";

public int lavaDepth = 10;

public boolean allowReplaceMoreBlocks = true;
}
public static boolean allowReplaceMoreBlocks = true;
}
87 changes: 27 additions & 60 deletions src/main/java/mods/tesseract/worleycaves/world/WorleyCaveGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
import net.minecraftforge.fluids.IFluidBlock;

public class WorleyCaveGenerator extends MapGenCaves {
int numLogChunks = 500;
long[] genTime = new long[numLogChunks];
int currentTimeIndex = 0;
double sum = 0;

int[][] testCords = {{2, 6}, {3, 11}, {7, 2}, {9, 13}, {12, 4}, {13, 9}};
private WorleyUtil worleyF1divF3 = new WorleyUtil();
private FastNoise displacementNoisePerlin = new FastNoise();
private MapGenBase replacementCaves;
Expand All @@ -48,19 +44,19 @@ public WorleyCaveGenerator() {
displacementNoisePerlin.SetNoiseType(FastNoise.NoiseType.Perlin);
displacementNoisePerlin.SetFrequency(0.05f);

maxCaveHeight = Configs.cavegen.maxCaveHeight;
minCaveHeight = Configs.cavegen.minCaveHeight;
noiseCutoff = (float) Configs.cavegen.noiseCutoffValue;
warpAmplifier = (float) Configs.cavegen.warpAmplifier;
easeInDepth = (float) Configs.cavegen.easeInDepth;
yCompression = (float) Configs.cavegen.verticalCompressionMultiplier;
xzCompression = (float) Configs.cavegen.horizonalCompressionMultiplier;
surfaceCutoff = (float) Configs.cavegen.surfaceCutoffValue;
lavaDepth = Configs.cavegen.lavaDepth;

lava = Blocks.lava;
maxCaveHeight = Configs.maxCaveHeight;
minCaveHeight = Configs.minCaveHeight;
noiseCutoff = (float) Configs.noiseCutoffValue;
warpAmplifier = (float) Configs.warpAmplifier;
easeInDepth = (float) Configs.easeInDepth;
yCompression = (float) Configs.verticalCompressionMultiplier;
xzCompression = (float) Configs.horizonalCompressionMultiplier;
surfaceCutoff = (float) Configs.surfaceCutoffValue;
lavaDepth = Configs.lavaDepth;

lava = (Block) Block.blockRegistry.getObject(Configs.lavaBlock);
if (lava == null) {
Main.LOGGER.error("Cannont find block " + Configs.cavegen.lavaBlock);
Main.LOGGER.error("Cannont find block " + Configs.lavaBlock);
lava = Blocks.air;
}

Expand All @@ -86,30 +82,19 @@ public void func_151539_a(IChunkProvider provider, World worldIn, int x, int z,
int currentDim = worldIn.provider.dimensionId;
this.worldObj = worldIn;
//revert to vanilla cave generation for blacklisted dims
for (int blacklistedDim : Configs.cavegen.blackListedDims) {
for (int blacklistedDim : Configs.blackListedDims) {
if (currentDim == blacklistedDim) {
this.replacementCaves.func_151539_a(provider, worldIn, x, z, blocks);
return;
}
}

//debugValueAdjustments();
this.generateWorleyCaves(worldIn, x, z, blocks);
}

public int getTopHeight(Block[] blocks) {
int y, i = getBlockIndex(7, Configs.cavegen.maxCaveHeight, 7);
for (; (y = (i & 0xff)) > 0; i--) {
Block b = blocks[i];
if (canReplaceBlock(b, Blocks.air))
break;
}
return y;
}

protected void generateWorleyCaves(World worldIn, int chunkX, int chunkZ, Block[] blocks) {
int seaLevel = 63;
float[][][] samples = sampleNoise(chunkX, chunkZ, getTopHeight(blocks) - 4);
float[][][] samples = sampleNoise(chunkX, chunkZ, getMaxSurfaceHeight(blocks) - 4);
float oneQuarter = 0.25F;
float oneHalf = 0.5F;
BiomeGenBase currentBiome;
Expand Down Expand Up @@ -205,7 +190,7 @@ protected void generateWorleyCaves(World worldIn, int chunkX, int chunkZ, Block[

//increase cutoff as we get closer to the minCaveHeight so it's not all flat floors
if (localY < (minCaveHeight + 5)) {
adjustedNoiseCutoff += ((minCaveHeight + 5) - localY) * 0.05;
adjustedNoiseCutoff += (float) (((minCaveHeight + 5) - localY) * 0.05);
}

if (noiseVal > adjustedNoiseCutoff) {
Expand Down Expand Up @@ -332,40 +317,22 @@ public float[][][] sampleNoise(int chunkX, int chunkZ, int maxSurfaceHeight) {
}

private int getSurfaceHeight(Block[] blocks, int localX, int localZ) {
//Using a recursive binary search to find the surface
return recursiveBinarySurfaceSearch(blocks, localX, localZ, 255, 0);
}

//Recursive binary search, this search always converges on the surface in 8 in cycles for the range 255 >= y >= 0
private int recursiveBinarySurfaceSearch(Block[] blocks, int localX, int localZ, int searchTop, int searchBottom) {
int top = searchTop;
if (searchTop > searchBottom) {
int searchMid = (searchBottom + searchTop) / 2;
if (canReplaceBlock(blocks[getBlockIndex(localX, searchMid, localZ)], Blocks.air)) {
top = recursiveBinarySurfaceSearch(blocks, localX, localZ, searchTop, searchMid + 1);
} else {
top = recursiveBinarySurfaceSearch(blocks, localX, localZ, searchMid, searchBottom);
}
int i = getBlockIndex(localX, Configs.maxCaveHeight, localZ), y;
while ((y = (i & 0xff)) > 0) {
if (canReplaceBlock(blocks[getBlockIndex(localX, i, localZ)], Blocks.air))
break;
i--;
}
return top;
return y;
}

//tests 6 points in hexagon pattern get max height of chunk
private int getMaxSurfaceHeight(Block[] blocks) {
int max = 0;
int[][] testcords = {{2, 6}, {3, 11}, {7, 2}, {9, 13}, {12, 4}, {13, 9}};

for (int n = 0; n < testcords.length; n++) {

int testmax = getSurfaceHeight(blocks, testcords[n][0], testcords[n][1]);
if (testmax > max) {
max = testmax;
if (max > maxCaveHeight)
return max;
}

int h = 0;
for (int[] testcord : testCords) {
h += getSurfaceHeight(blocks, testcord[0], testcord[1]);
}
return max;
return h / 6;
}

//returns true if block matches the top or filler block of the location biome
Expand Down Expand Up @@ -394,7 +361,7 @@ private boolean isExceptionBiome(BiomeGenBase biome) {
protected boolean canReplaceBlock(Block block, Block blockUp) {
if (block == null || blockUp.getMaterial() == Material.water)
return false;
return (Configs.cavegen.allowReplaceMoreBlocks && block.getMaterial() == Material.rock)
return (Configs.allowReplaceMoreBlocks && block.getMaterial() == Material.rock)
|| block == Blocks.stone
|| block == Blocks.dirt
|| block == Blocks.grass
Expand Down

0 comments on commit 369976b

Please sign in to comment.