mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-13 03:06:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up chunkgenerator stuff

Browse Source
This commit is contained in:
dfsek
2021-12-02 17:43:44 -07:00
parent 4a8d19cbf2
commit c68d092814
13 changed files with 57 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@@ -166,7 +166,6 @@ public class ConfigPackImpl implements ConfigPack {
logger.error("Failed to load config pack from folder \"{}\"", folder.getAbsolutePath(), e);
throw e;
}
toWorldConfig(new DummyServerWorld()); // Build now to catch any errors immediately.
}
public ConfigPackImpl(ZipFile file, Platform platform) throws ConfigException {
@@ -219,8 +218,6 @@ public class ConfigPackImpl implements ConfigPack {
logger.error("Failed to load config pack from ZIP archive \"{}\"", file.getName());
throw e;
}
toWorldConfig(new DummyServerWorld()); // Build now to catch any errors immediately.
}
@Override

14
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java
View File

@@ -27,14 +27,11 @@ import com.dfsek.terra.api.config.WorldConfig;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider;
import com.dfsek.terra.registry.LockedRegistryImpl;
import com.dfsek.terra.world.SamplerProviderImpl;
public class WorldConfigImpl implements WorldConfig {
private final SamplerProvider samplerProvider;
private final BiomeProvider provider;
private final ServerWorld world;
@@ -45,18 +42,12 @@ public class WorldConfigImpl implements WorldConfig {
public WorldConfigImpl(ServerWorld world, ConfigPackImpl pack, Platform platform) {
this.world = world;
this.pack = pack;
this.samplerProvider = new SamplerProviderImpl(platform, world);
pack.getRegistryMap().forEach((clazz, pair) -> registryMap.put(clazz, new LockedRegistryImpl<>(pair.getLeft())));
this.provider = pack.getBiomeProvider();
}
@Override
public int elevationBlend() {
return pack.getTemplate().getElevationBlend();
}
@Override
@SuppressWarnings("unchecked")
public <T> Registry<T> getRegistry(Class<T> clazz) {
@@ -68,11 +59,6 @@ public class WorldConfigImpl implements WorldConfig {
return world;
}
@Override
public SamplerProvider getSamplerCache() {
return samplerProvider;
}
@Override
public BiomeProvider getProvider() {
return provider;

62
common/implementation/base/src/main/java/com/dfsek/terra/world/SamplerProviderImpl.java
View File

@@ -1,62 +0,0 @@
/*
* This file is part of Terra.
*
* Terra is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Terra is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Terra. If not, see <https://www.gnu.org/licenses/>.
*/
package com.dfsek.terra.world;
import com.dfsek.terra.api.world.ServerWorld;
import com.dfsek.terra.api.world.chunk.generation.util.math.SamplerProvider;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import net.jafama.FastMath;
import org.jetbrains.annotations.NotNull;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.util.math.Sampler;
public class SamplerProviderImpl implements SamplerProvider {
private final LoadingCache<Long, Sampler> cache;
public SamplerProviderImpl(Platform platform, ServerWorld world) {
cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getSamplerCache())
.build(new CacheLoader<>() {
@Override
public Sampler load(@NotNull Long key) {
int cx = (int) (key >> 32);
int cz = (int) key.longValue();
return world.getGenerator().createSampler(cx, cz, world.getBiomeProvider(), world,
world.getConfig().elevationBlend());
}
});
}
@Override
public Sampler get(int x, int z) {
int cx = FastMath.floorDiv(x, 16);
int cz = FastMath.floorDiv(z, 16);
return getChunk(cx, cz);
}
@Override
public Sampler getChunk(int cx, int cz) {
long key = MathUtil.squash(cx, cz);
return cache.getUnchecked(key);
}
}