Reorganizing generator classes

BentoBoxWorld · Dec 21, 2022 · 52a5aea · 52a5aea
1 parent 4a675e0
commit 52a5aea
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 21 deletions.
diff --git a/src/main/java/world/bentobox/boxed/Boxed.java b/src/main/java/world/bentobox/boxed/Boxed.java
@@ -22,12 +22,12 @@
 import world.bentobox.bentobox.api.flags.Flag.Mode;
 import world.bentobox.bentobox.api.flags.Flag.Type;
 import world.bentobox.bentobox.managers.RanksManager;
-import world.bentobox.boxed.generators.AbstractBoxedChunkGenerator;
-import world.bentobox.boxed.generators.BoxedBiomeGenerator;
-import world.bentobox.boxed.generators.BoxedBlockPopulator;
-import world.bentobox.boxed.generators.BoxedChunkGenerator;
-import world.bentobox.boxed.generators.BoxedSeedChunkGenerator;
-import world.bentobox.boxed.generators.SeedBiomeGenerator;
+import world.bentobox.boxed.generators.biomes.BoxedBiomeGenerator;
+import world.bentobox.boxed.generators.biomes.SeedBiomeGenerator;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator;
+import world.bentobox.boxed.generators.chunks.BoxedBlockPopulator;
+import world.bentobox.boxed.generators.chunks.BoxedChunkGenerator;
+import world.bentobox.boxed.generators.chunks.BoxedSeedChunkGenerator;
 import world.bentobox.boxed.listeners.AdvancementListener;
 import world.bentobox.boxed.listeners.EnderPearlListener;
 

diff --git a/...enerators/AbstractBoxedBiomeProvider.java → ...rs/biomes/AbstractBoxedBiomeProvider.java b/...enerators/AbstractBoxedBiomeProvider.java → ...rs/biomes/AbstractBoxedBiomeProvider.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.biomes;
 
 import java.io.File;
 import java.util.Arrays;
@@ -23,6 +23,7 @@
 import com.google.common.base.Enums;
 
 import world.bentobox.boxed.Boxed;
+import world.bentobox.boxed.generators.chunks.BoxedChunkGenerator;
 
 /**
  * NOT USED

diff --git a/...generators/AbstractCopyBiomeProvider.java → ...ors/biomes/AbstractCopyBiomeProvider.java b/...generators/AbstractCopyBiomeProvider.java → ...ors/biomes/AbstractCopyBiomeProvider.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.biomes;
 
 import java.util.Arrays;
 import java.util.List;
@@ -10,6 +10,7 @@
 import org.bukkit.generator.WorldInfo;
 
 import world.bentobox.boxed.Boxed;
+import world.bentobox.boxed.generators.chunks.BoxedChunkGenerator;
 
 /**
  * Copies biomes from seed world

diff --git a/...generators/AbstractSeedBiomeProvider.java → ...ors/biomes/AbstractSeedBiomeProvider.java b/...generators/AbstractSeedBiomeProvider.java → ...ors/biomes/AbstractSeedBiomeProvider.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.biomes;
 
 import java.io.File;
 import java.util.Arrays;
@@ -29,6 +29,8 @@
 import world.bentobox.bentobox.util.Pair;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.boxed.Boxed;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator;
+import world.bentobox.boxed.generators.chunks.BoxedChunkGenerator;
 
 /**
  * Generates the biomes for the seed world

diff --git a/...boxed/generators/BoxedBiomeGenerator.java → ...enerators/biomes/BoxedBiomeGenerator.java b/...boxed/generators/BoxedBiomeGenerator.java → ...enerators/biomes/BoxedBiomeGenerator.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.biomes;
 
 import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;

diff --git a/...generators/BoxedNetherBiomeGenerator.java → ...ors/biomes/BoxedNetherBiomeGenerator.java b/...generators/BoxedNetherBiomeGenerator.java → ...ors/biomes/BoxedNetherBiomeGenerator.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.biomes;
 
 import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;

diff --git a/.../boxed/generators/SeedBiomeGenerator.java → ...generators/biomes/SeedBiomeGenerator.java b/.../boxed/generators/SeedBiomeGenerator.java → ...generators/biomes/SeedBiomeGenerator.java
@@ -1,10 +1,11 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.biomes;
 
 import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
 
 import world.bentobox.boxed.Boxed;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator;
 
 /**
  * @author tastybento

diff --git a/src/main/java/world/bentobox/boxed/generators/biomes/package-info.java b/src/main/java/world/bentobox/boxed/generators/biomes/package-info.java
@@ -0,0 +1 @@
+package world.bentobox.boxed.generators.biomes;
diff --git a/...nerators/AbstractBoxedChunkGenerator.java → ...s/chunks/AbstractBoxedChunkGenerator.java b/...nerators/AbstractBoxedChunkGenerator.java → ...s/chunks/AbstractBoxedChunkGenerator.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.chunks;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...boxed/generators/BoxedBlockPopulator.java → ...enerators/chunks/BoxedBlockPopulator.java b/...boxed/generators/BoxedBlockPopulator.java → ...enerators/chunks/BoxedBlockPopulator.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.chunks;
 
 import java.util.Map;
 import java.util.Objects;
@@ -22,8 +22,8 @@
 import world.bentobox.bentobox.blueprints.dataobjects.BlueprintCreatureSpawner;
 import world.bentobox.bentobox.util.Pair;
 import world.bentobox.boxed.Boxed;
-import world.bentobox.boxed.generators.AbstractBoxedChunkGenerator.ChestData;
-import world.bentobox.boxed.generators.AbstractBoxedChunkGenerator.ChunkStore;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator.ChestData;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator.ChunkStore;
 
 /**
  * @author tastybento

diff --git a/...boxed/generators/BoxedChunkGenerator.java → ...enerators/chunks/BoxedChunkGenerator.java b/...boxed/generators/BoxedChunkGenerator.java → ...enerators/chunks/BoxedChunkGenerator.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.chunks;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,9 +43,9 @@
 import world.bentobox.bentobox.blueprints.dataobjects.BlueprintEntity;
 import world.bentobox.bentobox.util.Pair;
 import world.bentobox.boxed.Boxed;
-import world.bentobox.boxed.generators.AbstractBoxedChunkGenerator.ChestData;
-import world.bentobox.boxed.generators.AbstractBoxedChunkGenerator.ChunkStore;
-import world.bentobox.boxed.generators.AbstractBoxedChunkGenerator.EntityData;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator.ChestData;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator.ChunkStore;
+import world.bentobox.boxed.generators.chunks.AbstractBoxedChunkGenerator.EntityData;
 
 /**
  * Chunk generator for all environments

diff --git a/...d/generators/BoxedSeedChunkGenerator.java → ...ators/chunks/BoxedSeedChunkGenerator.java b/...d/generators/BoxedSeedChunkGenerator.java → ...ators/chunks/BoxedSeedChunkGenerator.java
@@ -1,4 +1,4 @@
-package world.bentobox.boxed.generators;
+package world.bentobox.boxed.generators.chunks;
 
 import java.util.List;
 

diff --git a/src/main/java/world/bentobox/boxed/generators/chunks/package-info.java b/src/main/java/world/bentobox/boxed/generators/chunks/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * @author tastybento
+ *
+ */
+package world.bentobox.boxed.generators.chunks;