wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename IChunkGenerator -> IWorldGenerator

Browse Source
This commit is contained in:
James Seibel
2022-12-08 21:36:03 -06:00
parent 434abcf1ae
commit 1489cb0bdb
7 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java
-1
View File
@@ -2,7 +2,6 @@ package com.seibel.lod.api.interfaces.override.worldGenerator;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.api.objects.DhApiResult;
import com.seibel.lod.core.DependencyInjection.WorldGeneratorInjector;
/**
* Handles adding world generator overrides.
core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java
+1 -3
View File
@@ -25,7 +25,6 @@ import com.seibel.lod.core.config.Config;
import com.seibel.lod.api.enums.config.EDistanceGenerationMode;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
@@ -34,7 +33,6 @@ import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenera
import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps;
import org.apache.logging.log4j.Logger;
import java.lang.invoke.MethodHandles;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@@ -42,7 +40,7 @@ import java.util.function.Consumer;
* @author Leetom
* @version 2022-11-25
*/
public class BatchGenerator implements IChunkGenerator
public class BatchGenerator implements IWorldGenerator
{
private static final IWrapperFactory FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
core/src/main/java/com/seibel/lod/core/generation/IChunkGenerator.java → core/src/main/java/com/seibel/lod/core/generation/IWorldGenerator.java
+1 -2
View File
@@ -10,7 +10,6 @@ import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
import java.io.Closeable;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@@ -22,7 +21,7 @@ import java.util.function.Consumer;
* @author Leetom
* @version 2022-12-5
*/
public interface IChunkGenerator extends IDhApiWorldGenerator
public interface IWorldGenerator extends IDhApiWorldGenerator
{
/**
* Start a generation event
core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java
+2 -2
View File
@@ -25,7 +25,7 @@ public class WorldGenerationQueue implements Closeable
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
private final IChunkGenerator generator;
private final IWorldGenerator generator;
private final ConcurrentLinkedQueue<WorldGenTask> looseTasks = new ConcurrentLinkedQueue<>();
// FIXME: Concurrency issue on close!
@@ -57,7 +57,7 @@ public class WorldGenerationQueue implements Closeable
public WorldGenerationQueue(IChunkGenerator generator)
public WorldGenerationQueue(IWorldGenerator generator)
{
this.generator = generator;
this.maxGranularity = generator.getMaxGenerationGranularity();
core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java
+2 -2
View File
@@ -5,7 +5,7 @@ import com.seibel.lod.core.datatype.full.ChunkSizedData;
import com.seibel.lod.core.datatype.full.FullDataSource;
import com.seibel.lod.core.datatype.transform.ChunkToLodBuilder;
import com.seibel.lod.core.file.datafile.IDataSourceProvider;
import com.seibel.lod.core.generation.IChunkGenerator;
import com.seibel.lod.core.generation.IWorldGenerator;
import com.seibel.lod.core.generation.WorldGenerationQueue;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.pos.DhSectionPos;
@@ -365,7 +365,7 @@ public class DhClientServerLevel implements IDhClientLevel, IDhServerLevel
private class WorldGenState
{
public final IChunkGenerator chunkGenerator;
public final IWorldGenerator chunkGenerator;
public final WorldGenerationQueue worldGenerationQueue;
WorldGenState()
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java
-4
View File
@@ -1,10 +1,6 @@
package testItems.worldGeneratorInjection.objects;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.DependencyInjection.OverrideInjector;
/**
core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java
-4
View File
@@ -1,10 +1,6 @@
package testItems.worldGeneratorInjection.objects;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.DependencyInjection.OverrideInjector;
/**