From b5a90d92f33e8120813f7b12772b2a2c377e4d5c Mon Sep 17 00:00:00 2001
From: Ryan Michela <deltahat@gmail.com>
Date: Fri, 20 Sep 2013 23:14:40 -0700
Subject: [PATCH] Updating to Craftbukkit 1.6.4

---
 pom.xml                                       |  8 ++---
 .../subterranea/SBiomeBigHills.java           |  2 +-
 .../subterranea/SBiomeDecorator.java          | 30 +++++++++++--------
 .../ryanmichela/subterranea/SBiomeJungle.java |  2 +-
 .../subterranea/SBiomeJungleHills.java        |  2 +-
 .../subterranea/SChunkGenerator.java          |  6 ++--
 .../subterranea/SChunkProviderGenerate.java   |  4 +--
 .../subterranea/SWorldGenCanyon.java          |  2 +-
 .../subterranea/SWorldGenCaves.java           |  2 +-
 .../subterranea/SWorldGenLargeFeature.java    |  4 +--
 .../SWorldGenLargeFeatureStart.java           |  2 +-
 .../subterranea/SWorldGenPyramidPiece.java    |  6 ++--
 .../subterranea/SWorldGenSwampTree.java       |  2 +-
 .../subterranea/SWorldGenVines.java           |  2 +-
 .../subterranea/SWorldProvider.java           |  2 +-
 src/main/resources/plugin.yml                 |  2 +-
 16 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a1ce52..8f32f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.ryanmichela</groupId>
     <artifactId>Subterranea</artifactId>
     <name>Subterranea</name>
-    <version>1.6.2-R03</version>
+    <version>1.6.4-R01</version>
     <url>http://dev.bukkit.org/server-mods/subterranea/</url>
 
     <properties>
@@ -43,21 +43,21 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.6.2-R0.1</version>
+            <version>1.6.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.6.2-R0.1</version>
+            <version>1.6.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.ryanmichela</groupId>
             <artifactId>GiantCaves</artifactId>
-            <version>1.6.2-R0.1</version>
+            <version>1.6.4-R01</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>
diff --git a/src/main/java/com/ryanmichela/subterranea/SBiomeBigHills.java b/src/main/java/com/ryanmichela/subterranea/SBiomeBigHills.java
index 7926362..20210c5 100644
--- a/src/main/java/com/ryanmichela/subterranea/SBiomeBigHills.java
+++ b/src/main/java/com/ryanmichela/subterranea/SBiomeBigHills.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SBiomeDecorator.java b/src/main/java/com/ryanmichela/subterranea/SBiomeDecorator.java
index 0bb81d1..3bbfcf0 100644
--- a/src/main/java/com/ryanmichela/subterranea/SBiomeDecorator.java
+++ b/src/main/java/com/ryanmichela/subterranea/SBiomeDecorator.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 /**
  * Copyright 2013 Ryan Michela
@@ -173,18 +173,22 @@ protected void a() {
         }
 
         if (this.K) {
-            for (j = 0; j < 50; ++j) {
-                k = this.c + this.b.nextInt(16) + 8;
-                l = this.b.nextInt(this.b.nextInt(240) + 8); //120=240
-                i1 = this.d + this.b.nextInt(16) + 8;
-                (new WorldGenLiquids(Block.WATER.id)).a(this.a, this.b, k, l, i1);
-            }
-
-            for (j = 0; j < 20; ++j) {
-                k = this.c + this.b.nextInt(16) + 8;
-                l = this.b.nextInt(this.b.nextInt(this.b.nextInt(224) + 8) + 8); //112=224
-                i1 = this.d + this.b.nextInt(16) + 8;
-                (new WorldGenLiquids(Block.LAVA.id)).a(this.a, this.b, k, l, i1);
+            try {
+                for (j = 0; j < 50; ++j) {
+                    k = this.c + this.b.nextInt(16) + 8;
+                    l = this.b.nextInt(this.b.nextInt(240) + 8); //120=240
+                    i1 = this.d + this.b.nextInt(16) + 8;
+                    (new WorldGenLiquids(Block.WATER.id)).a(this.a, this.b, k, l, i1);
+                }
+
+                for (j = 0; j < 20; ++j) {
+                    k = this.c + this.b.nextInt(16) + 8;
+                    l = this.b.nextInt(this.b.nextInt(this.b.nextInt(224) + 8) + 8); //112=224
+                    i1 = this.d + this.b.nextInt(16) + 8;
+                    (new WorldGenLiquids(Block.LAVA.id)).a(this.a, this.b, k, l, i1);
+                }
+            } catch (Exception e) {
+                System.out.println("Exception in liquid population. Most likely an underground stream got too long. - " + e.getMessage());
             }
         }
     }
diff --git a/src/main/java/com/ryanmichela/subterranea/SBiomeJungle.java b/src/main/java/com/ryanmichela/subterranea/SBiomeJungle.java
index 509b860..ce00db9 100644
--- a/src/main/java/com/ryanmichela/subterranea/SBiomeJungle.java
+++ b/src/main/java/com/ryanmichela/subterranea/SBiomeJungle.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SBiomeJungleHills.java b/src/main/java/com/ryanmichela/subterranea/SBiomeJungleHills.java
index 919b9f0..84f67bd 100644
--- a/src/main/java/com/ryanmichela/subterranea/SBiomeJungleHills.java
+++ b/src/main/java/com/ryanmichela/subterranea/SBiomeJungleHills.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SChunkGenerator.java b/src/main/java/com/ryanmichela/subterranea/SChunkGenerator.java
index 21ad6db..da4b398 100644
--- a/src/main/java/com/ryanmichela/subterranea/SChunkGenerator.java
+++ b/src/main/java/com/ryanmichela/subterranea/SChunkGenerator.java
@@ -4,10 +4,10 @@
 import com.ryanmichela.giantcaves.GiantCavePopulator;
 import com.ryanmichela.moresilverfish.SilverfishPopulator;
 import com.ryanmichela.undergroundbiomes.UndergroundBiomePopulator;
-import net.minecraft.server.v1_6_R2.*;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.*;
+import net.minecraft.server.v1_6_R3.World;
 import org.bukkit.ChatColor;
-import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
diff --git a/src/main/java/com/ryanmichela/subterranea/SChunkProviderGenerate.java b/src/main/java/com/ryanmichela/subterranea/SChunkProviderGenerate.java
index 2977312..fd9609b 100644
--- a/src/main/java/com/ryanmichela/subterranea/SChunkProviderGenerate.java
+++ b/src/main/java/com/ryanmichela/subterranea/SChunkProviderGenerate.java
@@ -3,8 +3,8 @@
 /**
  * Copyright 2013 Ryan Michela
  */
-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.Arrays;
 import java.util.List;
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenCanyon.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenCanyon.java
index 46f7b03..a738ab0 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenCanyon.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenCanyon.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenCaves.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenCaves.java
index 8eae05f..d54cfd1 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenCaves.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenCaves.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeature.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeature.java
index eb6cdeb..99ea720 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeature.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeature.java
@@ -1,7 +1,7 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.StructureStart;
-import net.minecraft.server.v1_6_R2.WorldGenLargeFeature;
+import net.minecraft.server.v1_6_R3.StructureStart;
+import net.minecraft.server.v1_6_R3.WorldGenLargeFeature;
 
 /**
  * Copyright 2013 Ryan Michela
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeatureStart.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeatureStart.java
index a9cf39d..16b8850 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeatureStart.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenLargeFeatureStart.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenPyramidPiece.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenPyramidPiece.java
index 90d535a..81f2368 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenPyramidPiece.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenPyramidPiece.java
@@ -1,8 +1,8 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.StructureBoundingBox;
-import net.minecraft.server.v1_6_R2.World;
-import net.minecraft.server.v1_6_R2.WorldGenPyramidPiece;
+import net.minecraft.server.v1_6_R3.StructureBoundingBox;
+import net.minecraft.server.v1_6_R3.World;
+import net.minecraft.server.v1_6_R3.WorldGenPyramidPiece;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenSwampTree.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenSwampTree.java
index e4c3685..d5b5ed6 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenSwampTree.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenSwampTree.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 import org.bukkit.BlockChangeDelegate;
 
 import java.util.Random;
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldGenVines.java b/src/main/java/com/ryanmichela/subterranea/SWorldGenVines.java
index 474fb45..8fd2dd4 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldGenVines.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldGenVines.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.*;
+import net.minecraft.server.v1_6_R3.*;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ryanmichela/subterranea/SWorldProvider.java b/src/main/java/com/ryanmichela/subterranea/SWorldProvider.java
index 84c4506..b783f82 100644
--- a/src/main/java/com/ryanmichela/subterranea/SWorldProvider.java
+++ b/src/main/java/com/ryanmichela/subterranea/SWorldProvider.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_6_R2.WorldProviderNormal;
+import net.minecraft.server.v1_6_R3.WorldProviderNormal;
 
 /**
  * Copyright 2013 Ryan Michela
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 160c69a..346166f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Subterranea
-version: "1.6.2-R0.1 R3"
+version: "1.6.4-R0.1 R1"
 author: Ryan Michela
 main: com.ryanmichela.subterranea.SPlugin
 prefix: "Subterranea"