diff --git a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index 48a0d74b8..2a9bb4516 100644 --- a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -5,10 +5,12 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.terra.biome.palette.PaletteHolder; +import com.dfsek.terra.biome.palette.SinglePalette; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.generation.items.ores.Ore; import com.dfsek.terra.structure.TerraStructure; +import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.polydev.gaea.util.GlueList; @@ -60,7 +62,7 @@ public class BiomeTemplate implements ConfigTemplate { @Value("ocean.palette") @Abstractable @Default - private Palette oceanPalette; // TODO: default palette + private Palette oceanPalette = new SinglePalette<>(Material.WATER.createBlockData()); @Value("slant.y-offset.top") @Abstractable @Default diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index 1c0b11143..68ba3b623 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -181,7 +181,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { }*/ paletteLevel++; } else if(y <= sea) { - //chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, z + zOrig)); + chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, z + zOrig)); paletteLevel = 0; } else paletteLevel = 0; }