Final commit for first beta version! :)

hoqhuuep · Aug 2, 2014 · 6f6d365 · 6f6d365
1 parent d945622
commit 6f6d365
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/IslandCraft-Api/src/main/java/com/github/hoqhuuep/islandcraft/api/ICIsland.java b/IslandCraft-Api/src/main/java/com/github/hoqhuuep/islandcraft/api/ICIsland.java
@@ -5,12 +5,12 @@
  */
 public interface ICIsland {
     /**
-     * @return The seed used to randomly generate this island.
+     * @return The random seed used to generate this island.
      */
     long getSeed();
 
     /**
-     * @return The name of the Class used to generate this island.
+     * @return The IslandGenerator used to generate this island.
      */
     IslandGenerator getGenerator();
 

diff --git a/IslandCraft-Core/src/main/java/com/github/hoqhuuep/islandcraft/bukkit/IslandCraftPlugin.java b/IslandCraft-Core/src/main/java/com/github/hoqhuuep/islandcraft/bukkit/IslandCraftPlugin.java
@@ -30,11 +30,17 @@ public void onEnable() {
         }
 
         saveDefaultConfig();
-
-        islandCraft = new DefaultIslandCraft();
+        if (!getConfig().getString("config-version").equals("1.0.0")) {
+            getLogger().severe("Incompatible config-version found in config.yml");
+            getLogger().info("Check for updates at http://dev.bukkit.org/bukkit-plugins/islandcraft/");
+            setEnabled(false);
+            return;
+        }
 
         final IslandDatabase database = new EbeanServerIslandDatabase(EbeanServerUtil.build(this));
 
+        islandCraft = new DefaultIslandCraft();
+
         final Listener listener = new BiomeGeneratorListener(islandCraft, database, getConfig(), nms);
 
         getServer().getPluginManager().registerEvents(listener, this);

diff --git a/IslandCraft-Core/src/main/java/com/github/hoqhuuep/islandcraft/core/DefaultWorld.java b/IslandCraft-Core/src/main/java/com/github/hoqhuuep/islandcraft/core/DefaultWorld.java
@@ -40,6 +40,10 @@ public DefaultWorld(final String name, final long seed, final IslandDatabase dat
         ocean = classLoader.getBiomeDistribution(config.getString("ocean"));
         islandDistribution = classLoader.getIslandDistribution(config.getString("island-distribution"));
         islandGenerators = config.getStringList("island-generators");
+        // Load islandGenerators just to make sure there are no errors
+        for (final String islandGenerator : islandGenerators) {
+            classLoader.getIslandGenerator(islandGenerator);
+        }
         databaseCache = CacheBuilder.newBuilder().expireAfterAccess(30, TimeUnit.SECONDS).build(new DatabaseCacheLoader());
     }