Split out world generation by environment.

Requires changes in BentoBox.

#61

Author: tastybento

src/main/java/world/bentobox/acidisland/AISettings.java

@@ -146,10 +146,15 @@ public class AISettings implements WorldSettings {
     @ConfigEntry(path = "world.island-height")
     private int islandHeight = 50;
 
-    @ConfigComment("Use your own world generator for this world.")
-    @ConfigComment("In this case, the plugin will not generate anything.")
-    @ConfigEntry(path = "world.use-own-generator", experimental = true)
+    @ConfigComment("Use your own world generator for a world.")
+    @ConfigComment("In this case, the addon will not generate anything. Do not change unless you really know what you are doing.")
+    @ConfigEntry(path = "world.use-own-generator.world", experimental = true)
     private boolean useOwnGenerator;
+    @ConfigEntry(path = "world.use-own-generator.nether")
+    private boolean useOwnGeneratorNether;
+    @ConfigEntry(path = "world.use-own-generator.end")
+    private boolean useOwnGeneratorEnd;
+    
 
     @ConfigComment("Sea height (don't changes this mid-game unless you delete the world)")
     @ConfigComment("Minimum is 0, which means you are playing Skyblock!")
@@ -838,6 +843,18 @@ public boolean isTeamJoinDeathReset() {
     public boolean isUseOwnGenerator() {
         return useOwnGenerator;
     }
+    public boolean isUseOwnGeneratorNether() {
+        return useOwnGeneratorNether;
+    }
+    public void setUseOwnGeneratorNether(boolean useOwnGeneratorNether) {
+        this.useOwnGeneratorNether = useOwnGeneratorNether;
+    }
+    public boolean isUseOwnGeneratorEnd() {
+        return useOwnGeneratorEnd;
+    }
+    public void setUseOwnGeneratorEnd(boolean useOwnGeneratorEnd) {
+        this.useOwnGeneratorEnd = useOwnGeneratorEnd;
+    }
     @Override
     public boolean isWaterUnsafe() {
         // Water is unsafe in acid island

src/main/java/world/bentobox/acidisland/AcidIsland.java

@@ -39,7 +39,7 @@ public void onLoad() {
         // Load settings from config.yml. This will check if there are any issues with it too.
         loadSettings();
         // Chunk generator
-        chunkGenerator = settings.isUseOwnGenerator() ? null : new ChunkGeneratorWorld(this);
+        chunkGenerator = new ChunkGeneratorWorld(this);
         // Register commands
         adminCommand = new AcidCommand(this, settings.getAdminCommand());
         playerCommand = new AiCommand(this, settings.getIslandCommand());
@@ -103,8 +103,9 @@ public void createWorlds() {
             getLogger().info("Creating AcidIsland...");
         }
         // Create the world if it does not exist
-        chunkGenerator = new ChunkGeneratorWorld(this);
-        islandWorld = WorldCreator.name(worldName).type(WorldType.FLAT).environment(World.Environment.NORMAL).generator(chunkGenerator)
+        islandWorld = WorldCreator.name(worldName).type(WorldType.FLAT)
+                .environment(World.Environment.NORMAL)
+                .generator(settings.isUseOwnGenerator()? null : chunkGenerator)
                 .createWorld();
         // Make the nether if it does not exist
         if (settings.isNetherGenerate()) {
@@ -115,7 +116,7 @@ public void createWorlds() {
                 netherWorld = WorldCreator.name(worldName + NETHER).type(WorldType.NORMAL).environment(World.Environment.NETHER).createWorld();
 
             } else {
-                netherWorld = WorldCreator.name(worldName + NETHER).type(WorldType.FLAT).generator(chunkGenerator)
+                netherWorld = WorldCreator.name(worldName + NETHER).type(WorldType.FLAT).generator(settings.isUseOwnGeneratorNether()? null : chunkGenerator)
                         .environment(World.Environment.NETHER).createWorld();
             }
         }
@@ -127,7 +128,7 @@ public void createWorlds() {
             if (!settings.isEndIslands()) {
                 endWorld = WorldCreator.name(worldName + THE_END).type(WorldType.NORMAL).environment(World.Environment.THE_END).createWorld();
             } else {
-                endWorld = WorldCreator.name(worldName + THE_END).type(WorldType.FLAT).generator(chunkGenerator)
+                endWorld = WorldCreator.name(worldName + THE_END).type(WorldType.FLAT).generator(settings.isUseOwnGeneratorEnd()? null : chunkGenerator)
                         .environment(World.Environment.THE_END).createWorld();
             }
         }
@@ -147,7 +148,12 @@ public void onReload() {
 
     @Override
     public @NonNull ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
-        return chunkGenerator;
+        if ((islandWorld.getName().equalsIgnoreCase(worldName) && !settings.isUseOwnGenerator())
+                || (netherWorld !=null && netherWorld.getName().equalsIgnoreCase(worldName) && !settings.isUseOwnGeneratorNether())
+                || (endWorld != null && endWorld.getName().equalsIgnoreCase(worldName) && !settings.isUseOwnGeneratorEnd())) {
+            return chunkGenerator;
+        }
+        return null;
     }
 
     @Override

src/main/resources/config.yml

@@ -61,10 +61,13 @@ world:
   # Island height - Lowest is 5.
   # It is the y coordinate of the bedrock block in the schem.
   island-height: 50
-  # Use your own world generator for this world.
-  # In this case, the plugin will not generate anything.
+  # Use your own world generator for a world.
+  # In this case, the addon will not generate anything. Do not change unless you really know what you are doing.
   # /!\ This feature is experimental and might not work as expected or might not work at all.
-  use-own-generator: false
+  use-own-generator:
+    world: true
+    nether: true
+    end: true
   # Sea height (don't changes this mid-game unless you delete the world)
   # Minimum is 0, which means you are playing Skyblock!
   sea-height: 54