From fddf0c51b712d6ea2ffc72ba30f56fc040759922 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 1 May 2021 20:27:59 -0700 Subject: [PATCH] cleanup PopulationManager --- .../dfsek/terra/bukkit/population/Gaea.java | 21 ------------------- .../bukkit/population/PopulationManager.java | 10 +++++++-- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java deleted file mode 100644 index d1c856dcd..000000000 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.dfsek.terra.bukkit.population; - - -import com.dfsek.terra.api.platform.world.World; -import com.dfsek.terra.bukkit.world.BukkitWorld; - -import java.io.File; - -public class Gaea { - private static boolean debug; - - public static File getGaeaFolder(World w) { - File f = new File(((BukkitWorld) w).getWorldFolder(), "gaea"); - f.mkdirs(); - return f; - } - - public static boolean isDebug() { - return debug; - } -} diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index 2ed5fcd1c..e783c0118 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -33,17 +33,23 @@ public class PopulationManager extends BlockPopulator { @SuppressWarnings("unchecked") public synchronized void saveBlocks(World w) throws IOException { - File f = new File(Gaea.getGaeaFolder(w), "chunks.bin"); + File f = new File(getDataFolder(w), "chunks.bin"); f.createNewFile(); SerializationUtil.toFile((HashSet) needsPop.clone(), f); } @SuppressWarnings("unchecked") public synchronized void loadBlocks(World w) throws IOException, ClassNotFoundException { - File f = new File(Gaea.getGaeaFolder(w), "chunks.bin"); + File f = new File(getDataFolder(w), "chunks.bin"); needsPop.addAll((HashSet) SerializationUtil.fromFile(f)); } + public static File getDataFolder(World w) { + File f = new File(((BukkitWorld) w).getWorldFolder(), "gaea"); + f.mkdirs(); + return f; + } + // Synchronize to prevent chunks from being queued for population multiple times. public synchronized void checkNeighbors(int x, int z, World world) {