diff --git a/common/src/main/java/com/dfsek/terra/api/core/TerraPlugin.java b/common/src/main/java/com/dfsek/terra/api/core/TerraPlugin.java index 399c25392..85237e801 100644 --- a/common/src/main/java/com/dfsek/terra/api/core/TerraPlugin.java +++ b/common/src/main/java/com/dfsek/terra/api/core/TerraPlugin.java @@ -1,11 +1,11 @@ package com.dfsek.terra.api.core; import com.dfsek.terra.api.LoaderRegistrar; -import com.dfsek.terra.api.language.Language; import com.dfsek.terra.api.platform.handle.ItemHandle; import com.dfsek.terra.api.platform.handle.WorldHandle; import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.config.PluginConfig; +import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.debug.DebugLogger; import com.dfsek.terra.registry.ConfigRegistry; diff --git a/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java b/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java index e1f9a369b..a3d47ccd1 100644 --- a/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java +++ b/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java @@ -1,7 +1,6 @@ package com.dfsek.terra.config.lang; import com.dfsek.terra.api.core.TerraPlugin; -import com.dfsek.terra.api.language.Language; import com.dfsek.terra.api.platform.CommandSender; import java.io.File; diff --git a/common/src/main/java/com/dfsek/terra/api/language/Language.java b/common/src/main/java/com/dfsek/terra/config/lang/Language.java similarity index 97% rename from common/src/main/java/com/dfsek/terra/api/language/Language.java rename to common/src/main/java/com/dfsek/terra/config/lang/Language.java index d00066da7..2b5836391 100644 --- a/common/src/main/java/com/dfsek/terra/api/language/Language.java +++ b/common/src/main/java/com/dfsek/terra/config/lang/Language.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.language; +package com.dfsek.terra.config.lang; import com.dfsek.tectonic.config.Configuration; diff --git a/common/src/main/java/com/dfsek/terra/api/language/Message.java b/common/src/main/java/com/dfsek/terra/config/lang/Message.java similarity index 88% rename from common/src/main/java/com/dfsek/terra/api/language/Message.java rename to common/src/main/java/com/dfsek/terra/config/lang/Message.java index 8a064132b..20ac16c14 100644 --- a/common/src/main/java/com/dfsek/terra/api/language/Message.java +++ b/common/src/main/java/com/dfsek/terra/config/lang/Message.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.language; +package com.dfsek.terra.config.lang; import com.dfsek.terra.api.platform.CommandSender; diff --git a/common/src/main/java/com/dfsek/terra/api/language/MultiLineMessage.java b/common/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java similarity index 95% rename from common/src/main/java/com/dfsek/terra/api/language/MultiLineMessage.java rename to common/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java index 397ff629e..2d9ef1c12 100644 --- a/common/src/main/java/com/dfsek/terra/api/language/MultiLineMessage.java +++ b/common/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.language; +package com.dfsek.terra.config.lang; import com.dfsek.terra.api.platform.CommandSender; diff --git a/common/src/main/java/com/dfsek/terra/api/language/SingleLineMessage.java b/common/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java similarity index 95% rename from common/src/main/java/com/dfsek/terra/api/language/SingleLineMessage.java rename to common/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java index e3f65411b..f397dae50 100644 --- a/common/src/main/java/com/dfsek/terra/api/language/SingleLineMessage.java +++ b/common/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.language; +package com.dfsek.terra.config.lang; import com.dfsek.terra.api.platform.CommandSender; diff --git a/common/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java b/common/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java index b0ef4635e..1fdf39c6b 100644 --- a/common/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java +++ b/common/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java @@ -22,11 +22,11 @@ public class NoiseCarver implements Carver { @Override public void carve(World world, int chunkX, int chunkZ, ChunkAccess chunk) { - ChunkInterpolator interpolator = new BiomeChunkInterpolator(world, chunkX, chunkZ, main.getWorld(world).getBiomeProvider(), (gen, coord) -> gen.getCarver().getNoise(coord.setY(coord.getY() / 2))); + ChunkInterpolator interpolator = new BiomeChunkInterpolator(world, chunkX, chunkZ, main.getWorld(world).getBiomeProvider(), (gen, coord) -> gen.getCarver().getNoise(coord.setY(coord.getY()))); for(int y : range) { for(int x = 0; x < 16; x++) { for(int z = 0; z < 16; z++) { - double n = interpolator.getNoise(x, y * 2d, z); + double n = interpolator.getNoise(x, y, z); if(n > 0) chunk.setBlock(x, y, z, data); } } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 5c0ad6792..497e06ad8 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -2,7 +2,6 @@ package com.dfsek.terra.bukkit; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.core.TerraPlugin; -import com.dfsek.terra.api.language.Language; import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.MaterialData; import com.dfsek.terra.api.platform.handle.ItemHandle; @@ -24,6 +23,7 @@ import com.dfsek.terra.bukkit.world.BukkitTree; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfig; import com.dfsek.terra.config.lang.LangUtil; +import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.debug.DebugLogger; import com.dfsek.terra.registry.ConfigRegistry; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java index 0935938a9..bb40d30cd 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java @@ -2,7 +2,6 @@ package com.dfsek.terra.fabric; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.core.TerraPlugin; -import com.dfsek.terra.api.language.Language; import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.MaterialData; import com.dfsek.terra.api.platform.handle.ItemHandle; @@ -15,6 +14,7 @@ import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfig; import com.dfsek.terra.config.lang.LangUtil; +import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.debug.DebugLogger; import com.dfsek.terra.fabric.inventory.FabricItemHandle; diff --git a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java index 8f26cb66f..aa76db4f7 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java +++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java @@ -2,7 +2,6 @@ package com.dfsek.terra; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.core.TerraPlugin; -import com.dfsek.terra.api.language.Language; import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.MaterialData; import com.dfsek.terra.api.platform.handle.ItemHandle; @@ -12,6 +11,7 @@ import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfig; import com.dfsek.terra.config.lang.LangUtil; +import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.debug.DebugLogger; import com.dfsek.terra.platform.RawBiome; import com.dfsek.terra.platform.RawWorldHandle;