Refactor + optimizations

src/main/java/com/plotsquared/sponge/util/SpongeBlockManager.java

@@ -12,7 +12,6 @@ import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.biome.BiomeType;
 import org.spongepowered.api.world.biome.BiomeTypes;
 
-import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.schematic.PlotItem;

src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java

@@ -0,0 +1,123 @@
+package com.plotsquared.sponge.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.spongepowered.api.data.DataContainer;
+import org.spongepowered.api.world.Chunk;
+import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.storage.ChunkDataStream;
+
+import com.google.common.base.Optional;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.util.SetBlockQueue.ChunkWrapper;
+import com.intellectualcrafters.plot.util.TaskManager;
+
+public class SpongeChunkManager extends ChunkManager {
+    
+    @Override
+    public void setChunk(ChunkWrapper loc, PlotBlock[][] result) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+    @Override
+    public int[] countEntities(Plot plot) {
+        // TODO Auto-generated method stub
+        return new int[5];
+    }
+    
+    @Override
+    public boolean loadChunk(String world, ChunkLoc loc, boolean force) {
+        World worldObj = SpongeUtil.getWorld(world);
+        return worldObj.loadChunk(loc.x << 4, 0, loc.z << 4, force).isPresent();
+    }
+    
+    @Override
+    public boolean unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe) {
+        World worldObj = SpongeUtil.getWorld(world);
+        Optional<Chunk> chunk = worldObj.getChunk(loc.x << 4, 0, loc.z << 4);
+        if (chunk.isPresent()) {
+            return worldObj.unloadChunk(chunk.get());
+        }
+        return false;
+    }
+    
+    @Override
+    public List<ChunkLoc> getChunkChunks(String world) {
+        ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
+        World worldObj = SpongeUtil.getWorld(world);
+        ChunkDataStream storage = worldObj.getWorldStorage().getGeneratedChunks();
+        while (storage.hasNext()) {
+            DataContainer data = storage.next();
+            
+            // TODO get chunk from DataContainer
+        }
+        return chunks;
+    }
+    
+    @Override
+    public void regenerateChunk(String world, ChunkLoc loc) {
+        World worldObj = SpongeUtil.getWorld(world);
+        Optional<Chunk> chunk = worldObj.getChunk(loc.x << 4, 0, loc.z << 4);
+        if (chunk.isPresent()) {
+            // TODO regenerate chunk
+        }
+    }
+    
+    @Override
+    public void deleteRegionFile(String world, ChunkLoc loc) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+    @Override
+    public void deleteRegionFiles(String world, List<ChunkLoc> chunks) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+    @Override
+    public Plot hasPlot(String world, ChunkLoc chunk) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+    
+    @Override
+    public boolean copyRegion(Location pos1, Location pos2, Location newPos, Runnable whenDone) {
+        // TODO Auto-generated method stub
+        TaskManager.runTask(whenDone);
+        return false;
+    }
+    
+    @Override
+    public boolean regenerateRegion(Location pos1, Location pos2, Runnable whenDone) {
+        // TODO Auto-generated method stub
+        TaskManager.runTask(whenDone);
+        return false;
+    }
+    
+    @Override
+    public void clearAllEntities(Plot plot) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+    @Override
+    public void swap(String world, PlotId id, PlotId plotid) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+    @Override
+    public void swap(String worldname, Location bot1, Location top1, Location bot2, Location top2) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+}

src/main/java/com/plotsquared/sponge/util/SpongeCommand.java

@@ -14,7 +14,6 @@ import org.spongepowered.api.util.command.CommandResult;
 import org.spongepowered.api.util.command.CommandSource;
 
 import com.google.common.base.Optional;
-import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.commands.MainCommand;
 import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;

src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java

@@ -20,7 +20,7 @@ import com.intellectualcrafters.plot.object.PlotItemStack;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.InventoryUtil;
 import com.plotsquared.sponge.SpongeMain;
-import com.plotsquared.sponge.SpongePlayer;
+import com.plotsquared.sponge.object.SpongePlayer;
 
 public class SpongeInventoryUtil extends InventoryUtil {
 

src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java

@@ -0,0 +1,16 @@
+package com.plotsquared.sponge.util;
+
+import org.spongepowered.api.text.title.Title;
+
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.AbstractTitle;
+import com.plotsquared.sponge.SpongeMain;
+import com.plotsquared.sponge.object.SpongePlayer;
+
+public class SpongeTitleManager extends AbstractTitle {
+    
+    @Override
+    public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
+        ((SpongePlayer) player).player.sendTitle(new Title(SpongeMain.THIS.getText(head), SpongeMain.THIS.getText(sub), in * 20, delay * 20, out * 20, false, false));
+    }
+}

src/main/java/com/plotsquared/sponge/util/SpongeUtil.java

@@ -13,7 +13,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.sponge.SpongeMain;
-import com.plotsquared.sponge.SpongePlayer;
+import com.plotsquared.sponge.object.SpongePlayer;
 
 public class SpongeUtil {