Skip to content

Commit

Permalink
Improved biome height smoothing for Climstic Realistic
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackJar72 committed Jun 19, 2022
1 parent 1a817aa commit 38db28a
Show file tree
Hide file tree
Showing 979 changed files with 29 additions and 85 deletions.
Empty file modified .directory
100755 → 100644
Empty file.
Empty file modified .gitignore
100755 → 100644
Empty file.
Empty file modified .gradle/4.2.1/fileChanges/last-build.bin
100755 → 100644
Empty file.
Empty file modified .gradle/4.2.1/fileHashes/fileHashes.lock
100755 → 100644
Empty file.
Empty file modified .gradle/4.2.1/taskHistory/fileSnapshots.bin
100755 → 100644
Empty file.
Empty file modified .gradle/4.2.1/taskHistory/taskHistory.bin
100755 → 100644
Empty file.
Empty file modified .gradle/4.2.1/taskHistory/taskHistory.lock
100755 → 100644
Empty file.
Empty file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
100755 → 100644
Empty file.
Empty file modified .gradle/buildOutputCleanup/cache.properties
100755 → 100644
Empty file.
Empty file modified LICENSE
100755 → 100644
Empty file.
Empty file modified PCGQuestIdeas.md
100755 → 100644
Empty file.
Empty file modified README.md
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified dt-compat/main/resources/Icon.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified dt-compat/main/resources/assets/climaticbiomesdt/trees/pine.txt
100755 → 100644
Empty file.
Empty file modified dt-compat/main/resources/mcmod.info
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/ClimaticBiomes.java
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion main/java/jaredbgreat/climaticbiome/Info.java
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public final class Info {
public static final String ID = "climaticbiomesjbg";
public static final String NAME = "Climatic Biomes";
public static final String DIR = "ClimaticBiomes";
public static final String VERSION = "2.17.2";
public static final String VERSION = "2.17.3";
public static final String MINECRAFT = "1.12.2";
public static final String CHANNEL = "climaticbiomejbg";

Expand Down
Empty file modified main/java/jaredbgreat/climaticbiome/biomes/ModBiomes.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/biomes/SubBiome.java
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/biomes/basic/Pinewoods.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/biomes/basic/Scrub.java
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/biomes/basic/Wetland.java
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/biomes/feature/GenPine.java
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockBushBase.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockIgneous.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockLeafBase.java
100755 → 100644
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPeat.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPineDoor.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPineFence.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPineGate.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPineLog.java
100755 → 100644
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPinePlanks.java
100755 → 100644
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/BlockPineStairs.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/EnumWoodType.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/ModBlockBase.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/blocks/ModBlockFalling.java
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/generation/cache/Cache.java
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
110 changes: 27 additions & 83 deletions main/java/jaredbgreat/climaticbiome/generation/mapgenerator/TerrainPrimer.java
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static jaredbgreat.climaticbiome.generation.mapgenerator.MapMaker.RSIZE;

import jaredbgreat.climaticbiome.biomes.ModBiomes;
import jaredbgreat.climaticbiome.configuration.ClimaticWorldSettings;
import jaredbgreat.climaticbiome.generation.map.IRegionMap;
import jaredbgreat.climaticbiome.util.NoiseMap2D;
Expand Down Expand Up @@ -33,8 +34,7 @@ public void processTerrain(ChunkTile[] tiles, IRegionMap datamap, NoiseMap2D noi
int x = i / D;
int z = i % D;
int max = scale.width - 2;
if((x > 1) && (x < max) && (z > 1) && (z < max)
&& (tiles[i].shouldSmooth())) {
if((tiles[i].shouldSmooth())) {
smooth(tiles, x, z, scale, scratch);
} else {
scratch[i][0] = tiles[i].height;
Expand Down Expand Up @@ -66,85 +66,24 @@ private void smooth(ChunkTile[] tiles, int x, int z, SizeScale size, double[][]
scratch[loc][1] = tiles[loc].scale;
return;
}
//Row 2 up
ch += tiles[x - 2 + ((z - 2) * size.width)].height;
cs += tiles[x - 2 + ((z - 2) * size.width)].scale;
ch += tiles[x - 1 + ((z - 2) * size.width)].height;
cs += tiles[x - 1 + ((z - 2) * size.width)].scale;
ch += tiles[x + ((z - 2) * size.width)].height;
cs += tiles[x + ((z - 2) * size.width)].scale;
ch += tiles[x + 1 + ((z - 2) * size.width)].height;
cs += tiles[x + 1 + ((z - 2) * size.width)].scale;
ch += tiles[x + 2 + ((z - 2) * size.width)].height;
cs += tiles[x + 2 + ((z - 2) * size.width)].scale;
//Row 1 up
ch += tiles[x - 2 + ((z - 1) * size.width)].height;
cs += tiles[x - 2 + ((z - 1) * size.width)].scale;
ch += tiles[x - 1 + ((z - 1) * size.width)].height;
cs += tiles[x - 1 + ((z - 1) * size.width)].scale;
bh += tiles[x - 1 + ((z - 1) * size.width)].height;
bs += tiles[x - 1 + ((z - 1) * size.width)].scale;
ch += tiles[x + ((z - 1) * size.width)].height;
cs += tiles[x + ((z - 1) * size.width)].scale;
bh += tiles[x + ((z - 1) * size.width)].height;
bs += tiles[x + ((z - 1) * size.width)].scale;
ch += tiles[x + 1 + ((z - 1) * size.width)].height;
cs += tiles[x + 1 + ((z - 1) * size.width)].scale;
bh += tiles[x + 1 + ((z - 1) * size.width)].height;
bs += tiles[x + 1 + ((z - 1) * size.width)].scale;
ch += tiles[x + 2 + ((z - 1) * size.width)].height;
cs += tiles[x + 2 + ((z - 1) * size.width)].scale;
//Center row
ch += tiles[x - 2 + ((z) * size.width)].height;
cs += tiles[x - 2 + ((z) * size.width)].scale;
ch += tiles[x - 1 + ((z) * size.width)].height;
cs += tiles[x - 1 + ((z) * size.width)].scale;
bh += tiles[x - 1 + ((z) * size.width)].height;
bs += tiles[x - 1 + ((z) * size.width)].scale;
ch += tiles[x + ((z) * size.width)].height;
cs += tiles[x + ((z) * size.width)].scale;
bh += tiles[x + ((z) * size.width)].height;
bs += tiles[x + ((z) * size.width)].scale;
ch += tiles[x + 1 + ((z) * size.width)].height;
cs += tiles[x + 1 + ((z) * size.width)].scale;
bh += tiles[x + 1 + ((z) * size.width)].height;
bs += tiles[x + 1 + ((z) * size.width)].scale;
ch += tiles[x + 2 + ((z) * size.width)].height;
cs += tiles[x + 2 + ((z) * size.width)].scale;
//Row 1 down
ch += tiles[x - 2 + ((z + 1) * size.width)].height;
cs += tiles[x - 2 + ((z + 1) * size.width)].scale;
ch += tiles[x - 1 + ((z + 1) * size.width)].height;
cs += tiles[x - 1 + ((z + 1) * size.width)].scale;
bh += tiles[x - 1 + ((z + 1) * size.width)].height;
bs += tiles[x - 1 + ((z + 1) * size.width)].scale;
ch += tiles[x + ((z + 1) * size.width)].height;
cs += tiles[x + ((z + 1) * size.width)].scale;
bh += tiles[x + ((z + 1) * size.width)].height;
bs += tiles[x + ((z + 1) * size.width)].scale;
ch += tiles[x + 1 + ((z + 1) * size.width)].height;
cs += tiles[x + 1 + ((z + 1) * size.width)].scale;
bh += tiles[x + 1 + ((z + 1) * size.width)].height;
bs += tiles[x + 1 + ((z + 1) * size.width)].scale;
ch += tiles[x + 2 + ((z + 1) * size.width)].height;
cs += tiles[x + 2 + ((z + 1) * size.width)].scale;
//Row 2 down
ch += tiles[x - 2 + ((z + 2) * size.width)].height;
cs += tiles[x - 2 + ((z + 2) * size.width)].scale;
ch += tiles[x - 1 + ((z + 2) * size.width)].height;
cs += tiles[x - 1 + ((z + 2) * size.width)].scale;
bh += tiles[x - 1 + ((z + 2) * size.width)].height;
bs += tiles[x - 1 + ((z + 2) * size.width)].scale;
ch += tiles[x + ((z + 2) * size.width)].height;
cs += tiles[x + ((z + 2) * size.width)].scale;
bh += tiles[x + ((z + 2) * size.width)].height;
bs += tiles[x + ((z + 2) * size.width)].scale;
ch += tiles[x + 1 + ((z + 2) * size.width)].height;
cs += tiles[x + 1 + ((z + 2) * size.width)].scale;
bh += tiles[x + 1 + ((z + 2) * size.width)].height;
bs += tiles[x + 1 + ((z + 2) * size.width)].scale;
ch += tiles[x + 2 + ((z + 2) * size.width)].height;
cs += tiles[x + 2 + ((z + 2) * size.width)].scale;
int i2, j2, index, max;
max = size.width - 1;
for(int i = -2; i < 3; i++)
for(int j = -2; j < 3; j++) {
i2 = Math.max(Math.min(x + i, max), 0);
j2 = Math.max(Math.min(z + j, max), 0);
index = (j2 * size.width) + i2;
ch += tiles[index].height;
cs += tiles[index].scale;
}
for(int i = -1; i < 2; i++)
for(int j = -1; j < 2; j++) {
i2 = Math.max(Math.min(x + i, max), 0);
j2 = Math.max(Math.min(z + j, max), 0);
index = (j2 * size.width) + i2;
bh += tiles[index].height;
bs += tiles[index].scale;
}
//Divisions and completion
bh /=9;
bs /=9;
Expand All @@ -153,10 +92,15 @@ private void smooth(ChunkTile[] tiles, int x, int z, SizeScale size, double[][]
//Apply
if(BiomeDictionary.hasType(biome, BiomeDictionary.Type.OCEAN)) {
scratch[loc][0] = Math.min(((tiles[loc].height + bh + ch) / 3), Math.max(-0.2, biome.getBaseHeight()));
scratch[loc][1] = ((tiles[loc].scale + bs + cs) / 3);
} else if(biome == ModBiomes.activeVolcano) {
scratch[loc][0] = Math.max(tiles[loc].height,Math.max(((tiles[loc].height + bh + ch) / 3),
Math.min(0, biome.getBaseHeight())));
scratch[loc][1] = ((tiles[loc].scale + bs + cs) / 3);
} else {
scratch[loc][0] = Math.max(((tiles[loc].height + bh + ch) / 3), Math.min(0, biome.getBaseHeight()));
scratch[loc][0] = ch;
scratch[loc][1] = cs;
}
scratch[loc][1] = ((tiles[loc].scale + bs + cs) / 3);
}


Expand Down
2 changes: 1 addition & 1 deletion main/java/jaredbgreat/climaticbiome/generation/mapgenerator/TerrainType.java
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public enum TerrainType {
// Used for plateaus, before setting them to STEEP
PLATEAU (new PlateauHeightAdjuster(), false),
// Used for swamps, before setting them to STEEP
SWAMP (new SwampHeightAdjuster(), true);
SWAMP (new SwampHeightAdjuster(), false);

public static final TerrainType[] types = values(); // Just make it public, with no method call...

Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/gui/GuiCBToggleButton.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/gui/GuiConfigureWorld.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/gui/GuiIntSlider.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/gui/GuiScaleSlider.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/gui/GuiWorldTypeButton.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/items/ItemPeatBrick.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/items/ModItemBase.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/proxy/ClientProxy.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/proxy/IProxy.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/proxy/ServerProxy.java
100755 → 100644
Empty file.
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/BlockRegistrar.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/Debug.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/Externalizer.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/HeightNoiseMap.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/IHaveModel.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/ItemRegistrar.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/Logging.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/ModMath.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/NoiseMap2D.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/NoiseMap3D.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/SpatialHash.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/Vec2D.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/Vec3D.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/climaticbiome/util/VolumnNoiseMap.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/dldungeons/util/parser/CharSet.java
100755 → 100644
Empty file.
Empty file modified main/java/jaredbgreat/dldungeons/util/parser/Tokenizer.java
100755 → 100644
Empty file.
Empty file modified main/resources/assets/climaticbiomesjbg/BiomeLists/.directory
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading

0 comments on commit 38db28a

Please sign in to comment.