1.7.10 support

rmichela · Jul 22, 2014 · d50042c · d50042c
1 parent 8293817
commit d50042c
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.ryanmichela</groupId>
     <artifactId>Subterranea</artifactId>
     <name>Subterranea</name>
-    <version>1.7.8-R01</version>
+    <version>1.7.10-R0.1</version>
     <url>http://dev.bukkit.org/server-mods/subterranea/</url>
 
     <properties>
@@ -47,14 +47,14 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.7.8-R0.1-SNAPSHOT</version>
+            <version>1.7.10-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.ryanmichela</groupId>
             <artifactId>GiantCaves</artifactId>
-            <version>1.7.5-R01</version>
+            <version>1.7.10-R01</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>

diff --git a/src/main/java/com/ryanmichela/subterranea/ChunkDataCache.java b/src/main/java/com/ryanmichela/subterranea/ChunkDataCache.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea;
 
-import net.minecraft.server.v1_7_R3.ChunkSection;
+import net.minecraft.server.v1_7_R4.ChunkSection;
 
 /**
  * Created by rmichela on 3/9/14.

diff --git a/src/main/java/com/ryanmichela/subterranea/SChunkGenerator.java b/src/main/java/com/ryanmichela/subterranea/SChunkGenerator.java
@@ -8,8 +8,8 @@
 import com.ryanmichela.subterranea.entity.SEntitySquid;
 import com.ryanmichela.subterranea.worldgen.SWorldProvider;
 import com.ryanmichela.undergroundbiomes.UndergroundBiomePopulator;
-import net.minecraft.server.v1_7_R3.*;
-import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
+import net.minecraft.server.v1_7_R4.*;
+import org.bukkit.craftbukkit.v1_7_R4.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
@@ -1,7 +1,7 @@
 package com.ryanmichela.subterranea;
 
 import com.ryanmichela.subterranea.worldgen.SWorldGenCaves;
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Arrays;
 import java.util.Random;
@@ -72,6 +72,6 @@ public ChunkSection[] getChunkSectionsAt(int xx, int zz) {
         }
 
         Chunk localChunk = new Chunk(n, liftedWorld, blockData, xx, zz);
-        return localChunk.i();
+        return localChunk.getSections();
     }
 }
diff --git a/src/main/java/com/ryanmichela/subterranea/SPlugin.java b/src/main/java/com/ryanmichela/subterranea/SPlugin.java
@@ -5,13 +5,13 @@
 import com.ryanmichela.subterranea.worldgen.SWorldGenLargeFeatureStart;
 import com.ryanmichela.subterranea.worldgen.SWorldGenPyramidPiece;
 import com.ryanmichela.subterranea.worldgen.SWorldProvider;
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 import org.bukkit.ChatColor;
 import org.bukkit.craftbukkit.libs.joptsimple.OptionException;
 import org.bukkit.craftbukkit.libs.joptsimple.OptionParser;
 import org.bukkit.craftbukkit.libs.joptsimple.OptionSet;
-import org.bukkit.craftbukkit.v1_7_R3.CraftChunk;
-import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_7_R4.CraftChunk;
+import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkLoadEvent;
@@ -71,7 +71,7 @@ public void OnChunkLoad(ChunkLoadEvent event) {
         // As a solution, block data is cached until after the chunk is generated and then reapplied.
         if (event.isNewChunk() && ((CraftWorld)event.getChunk().getWorld()).getHandle().worldProvider instanceof SWorldProvider) {
             Chunk nmsChunk = ((CraftChunk)event.getChunk()).getHandle();
-            ChunkSection[] nmsSections = nmsChunk.i();
+            ChunkSection[] nmsSections = nmsChunk.getSections();
             ChunkSection[] chunkData = chunkDataCache.claimChunkData();
 
             for(int i = 0; i < 16; i++) {

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeBeach.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeBeach.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.biome;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeBigHillsBase.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeBigHillsBase.java
@@ -2,7 +2,7 @@
 
 import com.ryanmichela.subterranea.ReflectionUtil;
 import com.ryanmichela.subterranea.worldgen.SWorldProvider;
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 
@@ -43,7 +43,7 @@ public void a(World world, Random random, int i, int j) {
             int k1 = i + random.nextInt(16);
             int i2 = random.nextInt(64);
             int k2 = j + random.nextInt(16);
-            ((WorldGenerator) ReflectionUtil.getProtectedValue(this, "aC")).a(world, random, k1, i2, k2);
+            ((WorldGenerator) ReflectionUtil.getProtectedValue(this, "aC")).generate(world, random, k1, i2, k2);
         }
     }
 }

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeDecorator.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeDecorator.java
@@ -3,7 +3,7 @@
 import com.ryanmichela.subterranea.GeneratorOptions;
 import com.ryanmichela.subterranea.ReflectionUtil;
 import com.ryanmichela.subterranea.worldgen.SWorldProvider;
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 /**
  * Copyright 2013 Ryan Michela

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeDesertBase.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeDesertBase.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.biome;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeExtremeHills.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeExtremeHills.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.biome;
 
-import net.minecraft.server.v1_7_R3.BiomeTemperature;
+import net.minecraft.server.v1_7_R4.BiomeTemperature;
 
 /**
  * Created by rmichela on 3/10/14.

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeExtremeHillsPlus.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeExtremeHillsPlus.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.biome;
 
-import net.minecraft.server.v1_7_R3.BiomeTemperature;
+import net.minecraft.server.v1_7_R4.BiomeTemperature;
 
 /**
  * Created by rmichela on 3/10/14.

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeJungleBase.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeJungleBase.java
@@ -2,7 +2,7 @@
 
 import com.ryanmichela.subterranea.worldgen.SWorldGenVines;
 import com.ryanmichela.subterranea.worldgen.SWorldProvider;
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 
@@ -37,7 +37,7 @@ public void a(World world, Random random, int i, int j) {
             byte b0 = 64;
             int i1 = j + random.nextInt(16) + 8;
 
-            worldgenvines.a(world, random, l, b0, i1);
+            worldgenvines.generate(world, random, l, b0, i1);
         }
     }
 }
diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeJungleHills.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeJungleHills.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.biome;
 
-import net.minecraft.server.v1_7_R3.BiomeTemperature;
+import net.minecraft.server.v1_7_R4.BiomeTemperature;
 
 /**
  * Created by rmichela on 3/10/14.

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeMesaBase.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeMesaBase.java
@@ -1,7 +1,7 @@
 package com.ryanmichela.subterranea.biome;
 
 import com.ryanmichela.subterranea.worldgen.SWorldProvider;
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Arrays;
 import java.util.Random;

diff --git a/src/main/java/com/ryanmichela/subterranea/biome/SBiomeSmallMountains.java b/src/main/java/com/ryanmichela/subterranea/biome/SBiomeSmallMountains.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.biome;
 
-import net.minecraft.server.v1_7_R3.BiomeTemperature;
+import net.minecraft.server.v1_7_R4.BiomeTemperature;
 
 /**
  * Created by rmichela on 3/10/14.

diff --git a/src/main/java/com/ryanmichela/subterranea/entity/SEntitySlime.java b/src/main/java/com/ryanmichela/subterranea/entity/SEntitySlime.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.entity;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 /**
  * Copyright 2013 Ryan Michela

diff --git a/src/main/java/com/ryanmichela/subterranea/entity/SEntitySquid.java b/src/main/java/com/ryanmichela/subterranea/entity/SEntitySquid.java
@@ -1,7 +1,7 @@
 package com.ryanmichela.subterranea.entity;
 
-import net.minecraft.server.v1_7_R3.EntitySquid;
-import net.minecraft.server.v1_7_R3.World;
+import net.minecraft.server.v1_7_R4.EntitySquid;
+import net.minecraft.server.v1_7_R4.World;
 
 /**
  * Copyright 2013 Ryan Michela

diff --git a/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenCaves.java b/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenCaves.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.worldgen;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 

diff --git a/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenLargeFeature.java b/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenLargeFeature.java
@@ -1,7 +1,7 @@
 package com.ryanmichela.subterranea.worldgen;
 
-import net.minecraft.server.v1_7_R3.StructureStart;
-import net.minecraft.server.v1_7_R3.WorldGenLargeFeature;
+import net.minecraft.server.v1_7_R4.StructureStart;
+import net.minecraft.server.v1_7_R4.WorldGenLargeFeature;
 
 /**
  * Copyright 2013 Ryan Michela

diff --git a/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenLargeFeatureStart.java b/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenLargeFeatureStart.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.worldgen;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 

diff --git a/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenPyramidPiece.java b/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenPyramidPiece.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.worldgen;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 

diff --git a/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenVines.java b/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldGenVines.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.worldgen;
 
-import net.minecraft.server.v1_7_R3.*;
+import net.minecraft.server.v1_7_R4.*;
 
 import java.util.Random;
 
@@ -9,7 +9,7 @@
  */
 public class SWorldGenVines extends WorldGenVines {
     @Override
-    public boolean a(World world, Random random, int i, int j, int k) {
+    public boolean generate(World world, Random random, int i, int j, int k) {
         int l = i;
         int i1 = k;
         label0:

diff --git a/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldProvider.java b/src/main/java/com/ryanmichela/subterranea/worldgen/SWorldProvider.java
@@ -1,6 +1,6 @@
 package com.ryanmichela.subterranea.worldgen;
 
-import net.minecraft.server.v1_7_R3.WorldProviderNormal;
+import net.minecraft.server.v1_7_R4.WorldProviderNormal;
 
 /**
  * Copyright 2013 Ryan Michela

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Subterranea
-version: "1.7.5-R01"
+version: "1.7.10-R0.1"
 author: Ryan Michela
 main: com.ryanmichela.subterranea.SPlugin
 prefix: "Subterranea"