Implemented new biome API.

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java

@@ -0,0 +1,79 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.bukkit;
+
+import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
+import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.BiomeData;
+import com.sk89q.worldedit.world.registry.BiomeRegistry;
+import org.bukkit.block.Biome;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A biome registry for Bukkit.
+ */
+class BukkitBiomeRegistry implements BiomeRegistry {
+
+    BukkitBiomeRegistry() {
+    }
+
+    @Nullable
+    @Override
+    public BaseBiome createFromId(int id) {
+        return new BaseBiome(id);
+    }
+
+    @Override
+    public List<BaseBiome> getBiomes() {
+        BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
+        if (adapter != null) {
+            List<BaseBiome> biomes = new ArrayList<BaseBiome>();
+            for (Biome biome : Biome.values()) {
+                int biomeId = adapter.getBiomeId(biome);
+                biomes.add(new BaseBiome(biomeId));
+            }
+            return biomes;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Nullable
+    @Override
+    public BiomeData getData(BaseBiome biome) {
+        BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
+        if (adapter != null) {
+            final Biome bukkitBiome = adapter.getBiome(biome.getId());
+            return new BiomeData() {
+                @Override
+                public String getName() {
+                    return bukkitBiome.name();
+                }
+            };
+        } else {
+            return null;
+        }
+    }
+
+}

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitBiomeType.java

@@ -1,106 +0,0 @@
-/*
- * WorldEdit, a Minecraft world manipulation toolkit
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldEdit team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldedit.bukkit;
-
-import java.util.Locale;
-
-import org.bukkit.block.Biome;
-
-import com.sk89q.worldedit.BiomeType;
-
-public enum BukkitBiomeType implements BiomeType {
-
-    SWAMPLAND(Biome.SWAMPLAND),
-    FOREST(Biome.FOREST),
-    TAIGA(Biome.TAIGA),
-    DESERT(Biome.DESERT),
-    PLAINS(Biome.PLAINS),
-    HELL(Biome.HELL),
-    SKY(Biome.SKY),
-    RIVER(Biome.RIVER),
-    EXTREME_HILLS(Biome.EXTREME_HILLS),
-    OCEAN(Biome.OCEAN),
-    FROZEN_OCEAN(Biome.FROZEN_OCEAN),
-    FROZEN_RIVER(Biome.FROZEN_RIVER),
-    ICE_PLAINS(Biome.ICE_PLAINS),
-    ICE_MOUNTAINS(Biome.ICE_MOUNTAINS),
-    MUSHROOM_ISLAND(Biome.MUSHROOM_ISLAND),
-    MUSHROOM_SHORE(Biome.MUSHROOM_SHORE),
-    BEACH(Biome.BEACH),
-    DESERT_HILLS(Biome.DESERT_HILLS),
-    FOREST_HILLS(Biome.FOREST_HILLS),
-    TAIGA_HILLS(Biome.TAIGA_HILLS),
-    SMALL_MOUNTAINS(Biome.SMALL_MOUNTAINS),
-    JUNGLE(Biome.JUNGLE),
-    JUNGLE_HILLS(Biome.JUNGLE_HILLS),
-    JUNGLE_EDGE(Biome.JUNGLE_EDGE),
-    DEEP_OCEAN(Biome.DEEP_OCEAN),
-    STONE_BEACH(Biome.STONE_BEACH),
-    COLD_BEACH(Biome.COLD_BEACH),
-    BIRCH_FOREST(Biome.BIRCH_FOREST),
-    BIRCH_FOREST_HILLS(Biome.BIRCH_FOREST_HILLS),
-    ROOFED_FOREST(Biome.ROOFED_FOREST),
-    COLD_TAIGA(Biome.COLD_TAIGA),
-    COLD_TAIGA_HILLS(Biome.COLD_TAIGA_HILLS),
-    MEGA_TAIGA(Biome.MEGA_TAIGA),
-    MEGA_TAIGA_HILLS(Biome.MEGA_TAIGA_HILLS),
-    EXTREME_HILLS_PLUS(Biome.EXTREME_HILLS_PLUS),
-    SAVANNA(Biome.SAVANNA),
-    SAVANNA_PLATEAU(Biome.SAVANNA_PLATEAU),
-    MESA(Biome.MESA),
-    MESA_PLATEAU_FOREST(Biome.MESA_PLATEAU_FOREST),
-    MESA_PLATEAU(Biome.MESA_PLATEAU),
-    SUNFLOWER_PLAINS(Biome.SUNFLOWER_PLAINS),
-    DESERT_MOUNTAINS(Biome.DESERT_MOUNTAINS),
-    FLOWER_FOREST(Biome.FLOWER_FOREST),
-    TAIGA_MOUNTAINS(Biome.TAIGA_MOUNTAINS),
-    SWAMPLAND_MOUNTAINS(Biome.SWAMPLAND_MOUNTAINS),
-    ICE_PLAINS_SPIKES(Biome.ICE_PLAINS_SPIKES),
-    JUNGLE_MOUNTAINS(Biome.JUNGLE_MOUNTAINS),
-    JUNGLE_EDGE_MOUNTAINS(Biome.JUNGLE_EDGE_MOUNTAINS),
-    COLD_TAIGA_MOUNTAINS(Biome.COLD_TAIGA_MOUNTAINS),
-    SAVANNA_MOUNTAINS(Biome.SAVANNA_MOUNTAINS),
-    SAVANNA_PLATEAU_MOUNTAINS(Biome.SAVANNA_PLATEAU_MOUNTAINS),
-    MESA_BRYCE(Biome.MESA_BRYCE),
-    MESA_PLATEAU_FOREST_MOUNTAINS(Biome.MESA_PLATEAU_FOREST_MOUNTAINS),
-    MESA_PLATEAU_MOUNTAINS(Biome.MESA_PLATEAU_MOUNTAINS),
-    BIRCH_FOREST_MOUNTAINS(Biome.BIRCH_FOREST_MOUNTAINS),
-    BIRCH_FOREST_HILLS_MOUNTAINS(Biome.BIRCH_FOREST_HILLS_MOUNTAINS),
-    ROOFED_FOREST_MOUNTAINS(Biome.ROOFED_FOREST_MOUNTAINS),
-    MEGA_SPRUCE_TAIGA(Biome.MEGA_SPRUCE_TAIGA),
-    EXTREME_HILLS_MOUNTAINS(Biome.EXTREME_HILLS_MOUNTAINS),
-    EXTREME_HILLS_PLUS_MOUNTAINS(Biome.EXTREME_HILLS_PLUS_MOUNTAINS),
-    MEGA_SPRUCE_TAIGA_HILLS(Biome.MEGA_SPRUCE_TAIGA_HILLS);
-
-    private Biome bukkitBiome;
-
-    private BukkitBiomeType(Biome biome) {
-        this.bukkitBiome = biome;
-    }
-
-    @Override
-    public String getName() {
-        return name().toLowerCase(Locale.ENGLISH);
-    }
-
-    public Biome getBukkitBiome() {
-        return bukkitBiome;
-    }
-}

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitBiomeTypes.java

@@ -1,59 +0,0 @@
-/*
- * WorldEdit, a Minecraft world manipulation toolkit
- * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldEdit team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldedit.bukkit;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import com.sk89q.worldedit.BiomeType;
-import com.sk89q.worldedit.BiomeTypes;
-import com.sk89q.worldedit.UnknownBiomeTypeException;
-
-public class BukkitBiomeTypes implements BiomeTypes {
-
-    public BukkitBiomeTypes() {
-    }
-
-    @Override
-    public boolean has(String name) {
-        try {
-            BukkitBiomeType.valueOf(name.toUpperCase(Locale.ENGLISH));
-            return true;
-        } catch (IllegalArgumentException exc) {
-            return false;
-        }
-    }
-
-    @Override
-    public BiomeType get(String name) throws UnknownBiomeTypeException {
-        try {
-            return BukkitBiomeType.valueOf(name.toUpperCase(Locale.ENGLISH));
-        } catch (IllegalArgumentException exc) {
-            throw new UnknownBiomeTypeException(name);
-        }
-    }
-
-    @Override
-    public List<BiomeType> all() {
-        return Arrays.<BiomeType>asList(BukkitBiomeType.values());
-    }
-
-}

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java

@@ -21,7 +21,6 @@ package com.sk89q.worldedit.bukkit;
 
 import com.sk89q.bukkit.util.CommandInfo;
 import com.sk89q.bukkit.util.CommandRegistration;
-import com.sk89q.worldedit.BiomeTypes;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.ServerInterface;
@@ -50,13 +49,13 @@ public class BukkitServerInterface extends ServerInterface implements MultiUserP
     public Server server;
     public WorldEditPlugin plugin;
     private CommandRegistration dynamicCommands;
-    private BukkitBiomeTypes biomes;
+    private BukkitBiomeRegistry biomes;
     private boolean hookingEvents;
 
     public BukkitServerInterface(WorldEditPlugin plugin, Server server) {
         this.plugin = plugin;
         this.server = server;
-        this.biomes = new BukkitBiomeTypes();
+        this.biomes = new BukkitBiomeRegistry();
         dynamicCommands = new CommandRegistration(plugin);
     }
 
@@ -81,11 +80,6 @@ public class BukkitServerInterface extends ServerInterface implements MultiUserP
         plugin.loadConfiguration();
     }
 
-    @Override
-    public BiomeTypes getBiomes() {
-        return biomes;
-    }
-
     @Override
     public int schedule(long delay, long period, Runnable task) {
         return Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay, period);

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import com.sk89q.worldedit.BiomeType;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalWorld;
@@ -34,7 +33,7 @@ import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.TreeGenerator;
-import com.sk89q.worldedit.world.registry.LegacyWorldData;
+import com.sk89q.worldedit.world.biome.BaseBiome;
 import com.sk89q.worldedit.world.registry.WorldData;
 import org.bukkit.Effect;
 import org.bukkit.Material;
@@ -161,25 +160,6 @@ public class BukkitWorld extends LocalWorld {
         return getWorld().getBlockAt(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()).getLightLevel();
     }
 
-    @Override
-    public BiomeType getBiome(Vector2D pt) {
-        Biome bukkitBiome = getWorld().getBiome(pt.getBlockX(), pt.getBlockZ());
-        try {
-            return BukkitBiomeType.valueOf(bukkitBiome.name());
-        } catch (IllegalArgumentException exc) {
-            return BiomeType.UNKNOWN;
-        }
-    }
-
-    @Override
-    public void setBiome(Vector2D pt, BiomeType biome) {
-        if (biome instanceof BukkitBiomeType) {
-            Biome bukkitBiome;
-            bukkitBiome = ((BukkitBiomeType) biome).getBukkitBiome();
-            getWorld().setBiome(pt.getBlockX(), pt.getBlockZ(), bukkitBiome);
-        }
-    }
-
     @Override
     public boolean regenerate(Region region, EditSession editSession) {
         BaseBlock[] history = new BaseBlock[16 * 16 * (getMaxY() + 1)];
@@ -413,7 +393,7 @@ public class BukkitWorld extends LocalWorld {
 
     @Override
     public WorldData getWorldData() {
-        return LegacyWorldData.getInstance();
+        return BukkitWorldData.getInstance();
     }
 
     @Override
@@ -451,6 +431,29 @@ public class BukkitWorld extends LocalWorld {
         return new LazyBlock(bukkitBlock.getTypeId(), bukkitBlock.getData(), this, position);
     }
 
+    @Override
+    public BaseBiome getBiome(Vector2D position) {
+        BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
+        if (adapter != null) {
+            int id = adapter.getBiomeId(getWorld().getBiome(position.getBlockX(), position.getBlockZ()));
+            return new BaseBiome(id);
+        } else {
+            return new BaseBiome(0);
+        }
+    }
+
+    @Override
+    public boolean setBiome(Vector2D position, BaseBiome biome) {
+        BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
+        if (adapter != null) {
+            Biome bukkitBiome = adapter.getBiome(biome.getId());
+            getWorld().setBiome(position.getBlockX(), position.getBlockZ(), bukkitBiome);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * @deprecated Use {@link #setBlock(Vector, BaseBlock, boolean)}
      */
@@ -458,5 +461,4 @@ public class BukkitWorld extends LocalWorld {
     public boolean setBlock(Vector pt, com.sk89q.worldedit.foundation.Block block, boolean notifyAdjacent) throws WorldEditException {
         return setBlock(pt, (BaseBlock) block, notifyAdjacent);
     }
-
 }

src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorldData.java

@@ -0,0 +1,53 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.bukkit;
+
+import com.sk89q.worldedit.world.registry.BiomeRegistry;
+import com.sk89q.worldedit.world.registry.LegacyWorldData;
+
+/**
+ * World data for the Bukkit platform.
+ */
+class BukkitWorldData extends LegacyWorldData {
+
+    private static final BukkitWorldData INSTANCE = new BukkitWorldData();
+    private final BiomeRegistry biomeRegistry = new BukkitBiomeRegistry();
+
+    /**
+     * Create a new instance.
+     */
+    BukkitWorldData() {
+    }
+
+    @Override
+    public BiomeRegistry getBiomeRegistry() {
+        return biomeRegistry;
+    }
+
+    /**
+     * Get a static instance.
+     *
+     * @return an instance
+     */
+    public static BukkitWorldData getInstance() {
+        return INSTANCE;
+    }
+
+}

src/bukkit/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java

@@ -22,6 +22,8 @@ package com.sk89q.worldedit.bukkit.adapter;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.entity.BaseEntity;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Biome;
 import org.bukkit.entity.Entity;
 
 import javax.annotation.Nullable;
@@ -31,6 +33,46 @@ import javax.annotation.Nullable;
  */
 public interface BukkitImplAdapter {
 
+    /**
+     * Get the block ID for the given material.
+     *
+     * <p>Returns 0 if it is not known or it doesn't exist.</p>
+     *
+     * @param material the material
+     * @return the block ID
+     */
+    int getBlockId(Material material);
+
+    /**
+     * Get the material for the given block ID.
+     *
+     * <p>Returns {@link Material#AIR} if it is not known or it doesn't exist.</p>
+     *
+     * @param id the block ID
+     * @return the material
+     */
+    Material getMaterial(int id);
+
+    /**
+     * Get the biome ID for the given biome.
+     *
+     * <p>Returns 0 if it is not known or it doesn't exist.</p>
+     *
+     * @param biome biome
+     * @return the biome ID
+     */
+    int getBiomeId(Biome biome);
+
+    /**
+     * Get the biome ID for the given biome ID..
+     *
+     * <p>Returns {@link Biome#OCEAN} if it is not known or it doesn't exist.</p>
+     *
+     * @param id the biome ID
+     * @return the biome
+     */
+    Biome getBiome(int id);
+
     /**
      * Get the block at the given location.
      *