cleanup

trichner · Oct 25, 2015 · 663c85a · 663c85a
1 parent c78f05d
commit 663c85a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 515 deletions.
diff --git a/src/main/java/ch/k42/metropolis/generator/MetropolisGenerator.java b/src/main/java/ch/k42/metropolis/generator/MetropolisGenerator.java
@@ -1,17 +1,5 @@
 package ch.k42.metropolis.generator;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.generator.BlockPopulator;
-import org.bukkit.generator.ChunkGenerator;
-
 import ch.k42.metropolis.generator.populators.BedrockFloorPopulator;
 import ch.k42.metropolis.generator.populators.CavePopulator;
 import ch.k42.metropolis.generator.populators.OrePopulator;
@@ -27,6 +15,17 @@
 import ch.k42.metropolis.grid.urbanGrid.provider.NormalEnvironmentProvider;
 import ch.k42.metropolis.minions.Minions;
 import ch.k42.metropolis.plugin.MetropolisPlugin;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.generator.BlockPopulator;
+import org.bukkit.generator.ChunkGenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 
 /**
  * Created with IntelliJ IDEA.
@@ -104,7 +103,7 @@ public Long getWorldSeed() {
 
     @Override
     public List<BlockPopulator> getDefaultPopulators(World world) {
-        List<BlockPopulator> populators = new ArrayList<BlockPopulator>();
+        List<BlockPopulator> populators = new ArrayList<>();
         Minions.d("getDefaultPopulators: " + world.toString());
 
         this.world = world;
@@ -130,6 +129,20 @@ public boolean canSpawn(World world, int x, int z) {
         return true;
     }
 
+//    @Override
+//    public ChunkData generateChunkData(World world, Random random, int x, int z, BiomeGrid biome) {
+//        //return super.generateChunkData(world, random, x, z, biome);
+//        ChunkData chunk = super.generateChunkData(world, random, x, z, biome);
+//        biome.setBiome(x,z, Biome.PLAINS);
+//
+//
+//        int maxHeight = 65; //how thick we want out flat terrain to be
+//
+//        chunk.setRegion(0,0,0,16,maxHeight,16,Material.STONE);
+//
+//        return chunk;
+//    }
+
     @Override
     public byte[][] generateBlockSections(World aWorld, Random random, int chunkX, int chunkZ, BiomeGrid biomes) {
         if (natureDecay == null || decayProvider == null) { //FIXME TODO FUCKUP THIS IS NOT NECESSARY, use generator id (see MetropolisPlugin) memoization of providers, singletons

diff --git a/src/main/java/ch/k42/metropolis/grid/urbanGrid/clipboard/ClipboardLoader.java b/src/main/java/ch/k42/metropolis/grid/urbanGrid/clipboard/ClipboardLoader.java
@@ -7,5 +7,5 @@
  * Created by Thomas on 10.03.14.
  */
 public interface ClipboardLoader {
-    public Map<String,Clipboard> loadSchematics(File schematicsFolder, File cacheFolder);
+    Map<String,Clipboard> loadSchematics(File schematicsFolder, File cacheFolder);
 }
diff --git a/src/main/java/ch/k42/metropolis/grid/urbanGrid/clipboard/ClipboardLoaderWE.java b/src/main/java/ch/k42/metropolis/grid/urbanGrid/clipboard/ClipboardLoaderWE.java