chores: make more things related to chunk generating context public f…

…or using
AllayMC · Jun 16, 2024 · 715b08b · 715b08b
1 parent d52b606
commit 715b08b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGenerator.java b/Allay-API/src/main/java/org/allaymc/api/world/generator/WorldGenerator.java
@@ -8,6 +8,8 @@
 import org.allaymc.api.world.generator.function.Lighter;
 import org.allaymc.api.world.generator.function.Populator;
 
+import java.util.function.Consumer;
+
 /**
  * Allay Project 2024/6/16
  *
@@ -30,6 +32,8 @@ static WorldGeneratorBuilder builder() {
     String getPreset();
 
     void setDimension(Dimension dimension);
+
+    Dimension getDimension();
 
     interface WorldGeneratorBuilder {
         WorldGeneratorBuilder name(String name);
@@ -46,6 +50,8 @@ interface WorldGeneratorBuilder {
 
         WorldGeneratorBuilder entitySpawners(EntitySpawner... entitySpawners);
 
+        WorldGeneratorBuilder onDimensionSet(Consumer<Dimension> onDimensionSet);
+
         WorldGenerator build();
     }
 

diff --git a/...PI/src/main/java/org/allaymc/api/world/generator/context/OtherChunkAccessibleContext.java b/...PI/src/main/java/org/allaymc/api/world/generator/context/OtherChunkAccessibleContext.java
@@ -1,5 +1,6 @@
 package org.allaymc.api.world.generator.context;
 
+import lombok.Getter;
 import org.allaymc.api.world.chunk.ChunkAccessible;
 import org.allaymc.api.world.chunk.UnsafeChunk;
 
@@ -10,6 +11,7 @@
  */
 public abstract class OtherChunkAccessibleContext extends Context {
 
+    @Getter
     protected ChunkAccessible chunkAccessor;
 
     public OtherChunkAccessibleContext(UnsafeChunk currentChunk, ChunkAccessible chunkAccessor) {

diff --git a/Allay-Server/src/main/java/org/allaymc/server/world/generator/AllayWorldGenerator.java b/Allay-Server/src/main/java/org/allaymc/server/world/generator/AllayWorldGenerator.java
@@ -22,13 +22,13 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * Allay Project 2023/7/1
  *
  * @author daoge_cmd
  */
-@Getter
 @Slf4j
 public final class AllayWorldGenerator implements WorldGenerator {
 
@@ -42,9 +42,11 @@ public final class AllayWorldGenerator implements WorldGenerator {
     private final List<Populator> populators ;
     private final List<Lighter> lighters;
     private final List<EntitySpawner> entitySpawners;
+    private final Consumer<Dimension> onDimensionSet;
     // 存储基本区块，基本区块的ChunkStatus为NOISED
     private final Map<Long, Chunk> basicChunks = new Long2ObjectNonBlockingMap<>();
 
+    @Getter
     private Dimension dimension; // Will be set later
 
     public static AllayWorldGeneratorBuilder builder() {
@@ -58,7 +60,8 @@ private AllayWorldGenerator(
             List<Noiser> noisers,
             List<Populator> populators,
             List<Lighter> lighters,
-            List<EntitySpawner> entitySpawners
+            List<EntitySpawner> entitySpawners,
+            Consumer<Dimension> onDimensionSet
     ) {
         this.name = name;
         this.type = type;
@@ -67,6 +70,7 @@ private AllayWorldGenerator(
         this.populators = populators;
         this.lighters = lighters;
         this.entitySpawners = entitySpawners;
+        this.onDimensionSet = onDimensionSet;
         init();
     }
 
@@ -83,6 +87,7 @@ public void setDimension(Dimension dimension) {
             throw new IllegalStateException("Dimension already set");
         }
         this.dimension = dimension;
+        onDimensionSet.accept(dimension);
     }
 
     /**
@@ -195,6 +200,7 @@ public static final class AllayWorldGeneratorBuilder implements WorldGenerator.W
         private List<Populator> populators = List.of();
         private List<Lighter> lighters = List.of();
         private List<EntitySpawner> entitySpawners = List.of();
+        private Consumer<Dimension> onDimensionSet;
 
         public AllayWorldGeneratorBuilder name(String name) {
             this.name = name;
@@ -231,11 +237,16 @@ public AllayWorldGeneratorBuilder entitySpawners(EntitySpawner... entitySpawners
             return this;
         }
 
+        public AllayWorldGeneratorBuilder onDimensionSet(Consumer<Dimension> onDimensionSet) {
+            this.onDimensionSet = onDimensionSet;
+            return this;
+        }
+
         public WorldGenerator build() {
             if (name == null || name.isBlank()) {
                 throw new IllegalStateException("Name cannot be null or blank");
             }
-            return new AllayWorldGenerator(name, type, preset, noisers, populators, lighters, entitySpawners);
+            return new AllayWorldGenerator(name, type, preset, noisers, populators, lighters, entitySpawners, onDimensionSet);
         }
     }
 }