From 999c9b565d3b3457b99e74995429a49f8d419e6f Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 10 Jan 2021 17:20:21 -0700 Subject: [PATCH] fix biomegrid wackiness --- .../com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java | 3 +-- .../dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java | 5 ++--- .../terra/biome/grid/master/TerraStandardBiomeGrid.java | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java index a0fec53ec..15ead5273 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java @@ -3,7 +3,6 @@ package com.dfsek.terra.biome.grid.master; import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.api.world.biome.BiomeGrid; import com.dfsek.terra.biome.BiomeZone; -import com.dfsek.terra.biome.grid.UserDefinedGrid; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPackTemplate; import com.dfsek.terra.config.builder.biomegrid.BiomeGridBuilder; @@ -21,7 +20,7 @@ public abstract class TerraBiomeGrid extends BiomeGrid { return zone; } - public abstract UserDefinedGrid getGrid(int x, int z); + public abstract BiomeGrid getGrid(int x, int z); public enum Type { RADIAL, STANDARD diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java index 4bd66f86b..28848842d 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java @@ -7,7 +7,6 @@ import com.dfsek.terra.api.world.biome.BiomeGrid; import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.UserDefinedBiome; -import com.dfsek.terra.biome.grid.UserDefinedGrid; import com.dfsek.terra.biome.postprocessing.CoordinatePerturb; import com.dfsek.terra.biome.postprocessing.ErosionNoise; import com.dfsek.terra.config.base.ConfigPack; @@ -34,8 +33,8 @@ public class TerraRadialBiomeGrid extends TerraBiomeGrid { } @Override - public UserDefinedGrid getGrid(int x, int z) { - return (UserDefinedGrid) zone.getGrid(x, z); + public BiomeGrid getGrid(int x, int z) { + return zone.getGrid(x, z); } @Override diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java index e17e88fbb..7ae8911f9 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java @@ -3,10 +3,10 @@ package com.dfsek.terra.biome.grid.master; import com.dfsek.terra.api.math.vector.Location; import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.BiomeGrid; import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.UserDefinedBiome; -import com.dfsek.terra.biome.grid.UserDefinedGrid; import com.dfsek.terra.biome.postprocessing.CoordinatePerturb; import com.dfsek.terra.biome.postprocessing.ErosionNoise; import com.dfsek.terra.config.base.ConfigPack; @@ -28,8 +28,8 @@ public class TerraStandardBiomeGrid extends TerraBiomeGrid { } @Override - public UserDefinedGrid getGrid(int x, int z) { - return (UserDefinedGrid) zone.getGrid(x, z); + public BiomeGrid getGrid(int x, int z) { + return zone.getGrid(x, z); } @Override