Update to Minecraft 1.6.4

I had to redo large parts of the structure code to make them save and
load properly.

Author: rutgerkok

bukkit/src/com/khorn/terraincontrol/bukkit/BiomeCacheWrapper.java

@@ -1,8 +1,8 @@
 package com.khorn.terraincontrol.bukkit;
 
-import net.minecraft.server.v1_6_R2.BiomeBase;
-import net.minecraft.server.v1_6_R2.BiomeCache;
-import net.minecraft.server.v1_6_R2.WorldChunkManager;
+import net.minecraft.server.v1_6_R3.BiomeBase;
+import net.minecraft.server.v1_6_R3.BiomeCache;
+import net.minecraft.server.v1_6_R3.WorldChunkManager;
 
 public class BiomeCacheWrapper implements com.khorn.terraincontrol.biomegenerators.BiomeCache
 {

bukkit/src/com/khorn/terraincontrol/bukkit/BiomeReplace.java

@@ -2,9 +2,9 @@
 
 import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.bukkit.commands.BaseCommand;
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 
 import java.io.*;
 import java.lang.reflect.Field;

bukkit/src/com/khorn/terraincontrol/bukkit/BukkitBiome.java

@@ -3,7 +3,7 @@
 import com.khorn.terraincontrol.DefaultBiome;
 import com.khorn.terraincontrol.LocalBiome;
 import com.khorn.terraincontrol.configuration.BiomeConfig;
-import net.minecraft.server.v1_6_R2.BiomeBase;
+import net.minecraft.server.v1_6_R3.BiomeBase;
 
 /**
  * The BukkitBiome is basically a wrapper for the BiomeBase.

bukkit/src/com/khorn/terraincontrol/bukkit/BukkitWorld.java

@@ -11,8 +11,8 @@
 import com.khorn.terraincontrol.configuration.WorldConfig;
 import com.khorn.terraincontrol.customobjects.CustomObjectStructureCache;
 import com.khorn.terraincontrol.generator.resourcegens.TreeType;
-import net.minecraft.server.v1_6_R2.*;
-import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import net.minecraft.server.v1_6_R3.*;
+import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 
 import java.util.ArrayList;
 import java.util.HashMap;

bukkit/src/com/khorn/terraincontrol/bukkit/CustomBiome.java

@@ -4,12 +4,12 @@
 import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.WeightedMobSpawnGroup;
-import net.minecraft.server.v1_6_R2.BiomeBase;
-import net.minecraft.server.v1_6_R2.BiomeMeta;
-import net.minecraft.server.v1_6_R2.Entity;
-import net.minecraft.server.v1_6_R2.EntityTypes;
+import net.minecraft.server.v1_6_R3.BiomeBase;
+import net.minecraft.server.v1_6_R3.BiomeMeta;
+import net.minecraft.server.v1_6_R3.Entity;
+import net.minecraft.server.v1_6_R3.EntityTypes;
 import org.bukkit.block.Biome;
-import org.bukkit.craftbukkit.v1_6_R2.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_6_R3.block.CraftBlock;
 
 import java.lang.reflect.Field;
 import java.util.List;

bukkit/src/com/khorn/terraincontrol/bukkit/MapWriter.java

@@ -5,9 +5,8 @@
 import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.sun.imageio.plugins.png.PNGImageWriter;
 import com.sun.imageio.plugins.png.PNGImageWriterSpi;
-
-import net.minecraft.server.v1_6_R2.BiomeBase;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.BiomeBase;
+import net.minecraft.server.v1_6_R3.World;
 import org.bukkit.command.CommandSender;
 
 import java.awt.Color;

bukkit/src/com/khorn/terraincontrol/bukkit/NullBiome.java

@@ -1,7 +1,7 @@
 package com.khorn.terraincontrol.bukkit;
 
 import com.khorn.terraincontrol.configuration.BiomeConfig;
-import net.minecraft.server.v1_6_R2.BiomeBase;
+import net.minecraft.server.v1_6_R3.BiomeBase;
 
 public class NullBiome extends BukkitBiome
 {

bukkit/src/com/khorn/terraincontrol/bukkit/TCBlockPopulator.java

@@ -4,7 +4,7 @@
 import com.khorn.terraincontrol.generator.ObjectSpawner;
 import org.bukkit.Chunk;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_6_R3.CraftChunk;
 import org.bukkit.generator.BlockPopulator;
 
 import java.util.Random;

bukkit/src/com/khorn/terraincontrol/bukkit/TCChunkGenerator.java

@@ -2,7 +2,7 @@
 
 import com.khorn.terraincontrol.configuration.WorldConfig;
 import com.khorn.terraincontrol.generator.ChunkProviderTC;
-import net.minecraft.server.v1_6_R2.Block;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
@@ -52,8 +52,8 @@ public boolean canSpawn(World world, int x, int z)
     {
         this.plugin.onWorldInit(world);
 
-        int i = world.getHighestBlockAt(x, z).getTypeId();
-        return i != 0 && Block.byId[i].material.isSolid();
+        Material material = world.getHighestBlockAt(x, z).getType();
+        return material.isSolid();
     }
 
     @Override

bukkit/src/com/khorn/terraincontrol/bukkit/TCPlugin.java

@@ -4,23 +4,28 @@
 import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.TerrainControlEngine;
 import com.khorn.terraincontrol.bukkit.commands.TCCommandExecutor;
+import com.khorn.terraincontrol.bukkit.structuregens.RareBuildingStart;
+import com.khorn.terraincontrol.bukkit.structuregens.VillageStart;
 import com.khorn.terraincontrol.bukkit.util.BukkitMetricsHelper;
 import com.khorn.terraincontrol.configuration.TCDefaultValues;
 import com.khorn.terraincontrol.configuration.TCLogManager;
 import com.khorn.terraincontrol.configuration.WorldConfig;
 import com.khorn.terraincontrol.customobjects.BODefaultValues;
 import com.khorn.terraincontrol.util.StringHelper;
-import net.minecraft.server.v1_6_R2.BiomeBase;
-import net.minecraft.server.v1_6_R2.Block;
+import com.khorn.terraincontrol.util.StructureNames;
+import net.minecraft.server.v1_6_R3.BiomeBase;
+import net.minecraft.server.v1_6_R3.Block;
+import net.minecraft.server.v1_6_R3.WorldGenFactory;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_6_R2.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_6_R3.block.CraftBlock;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.UUID;
 import java.util.logging.Level;
@@ -32,14 +37,15 @@ public class TCPlugin extends JavaPlugin implements TerrainControlEngine
     public TCListener listener;
     public TCCommandExecutor commandExecutor;
 
-    /* Debug setting. Set it to true to make Terrain Control try to disable
+    /*
+     * Debug setting. Set it to true to make Terrain Control try to disable
      * itself. However, terrain generators aren't cleaned up properly by
      * Bukkit, so this won't really work until that bug is fixed.
      */
     public boolean cleanupOnDisable = false;
 
     public final HashMap<UUID, BukkitWorld> worlds = new HashMap<UUID, BukkitWorld>();
-    
+
     private final HashMap<String, BukkitWorld> notInitedWorlds = new HashMap<String, BukkitWorld>();
     private Logger logger;
 
@@ -87,6 +93,18 @@ public void onEnable()
                 this.log(Level.INFO, "MCPC+ detected, enabling extended block id support.");
             }
 
+            // Register structures
+            try
+            {
+                Method registerStructure = WorldGenFactory.class.getDeclaredMethod("b", Class.class, String.class);
+                registerStructure.setAccessible(true);
+                registerStructure.invoke(null, RareBuildingStart.class, StructureNames.RARE_BUILDING);
+                registerStructure.invoke(null, VillageStart.class, StructureNames.VILLAGE);
+            } catch (Exception e)
+            {
+                TerrainControl.log(Level.SEVERE, "Failed to register structures: {0}", e);
+            }
+
             // Start the engine
             TerrainControl.startEngine();
             this.commandExecutor = new TCCommandExecutor(this);
@@ -234,25 +252,19 @@ public void logIfLevel(Level min, Level max, String messages, Object[] params)
             this.log(max, messages);
         }
     }
-    
+
     @Override
     public void log(Level level, String... messages)
     {
-        this.log(level, "{0}", new Object[]
-        {
-            StringHelper.join(messages, " ")
-        });
+        this.log(level, "{0}", new Object[] {StringHelper.join(messages, " ")});
     }
 
     @Override
     public void log(Level level, String message, Object param)
     {
         LogRecord lr = new LogRecord(level, message);
         lr.setMessage(TCLogManager.formatter.format(lr));
-        lr.setParameters(new Object[]
-        {
-            param
-        });
+        lr.setParameters(new Object[] {param});
         if (logger == null)
         {
             logger = TCLogManager.getLogger();