AC darkstone cliff blocks only generate in AC biomes. (#944)

AC darkstone cliff blocks only generate in AC biomes.
Team-RTG · Sep 14, 2016 · 4118f24 · 4118f24
1 parent e748e5e
commit 4118f24
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 29 deletions.
diff --git a/src/main/java/rtg/world/gen/surface/SurfaceBase.java b/src/main/java/rtg/world/gen/surface/SurfaceBase.java
@@ -9,8 +9,6 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.ChunkPrimer;
 
-import com.shinoow.abyssalcraft.api.block.ACBlocks;
-
 import rtg.api.biome.BiomeConfig;
 import rtg.config.rtg.ConfigRTG;
 import rtg.util.CellNoise;
@@ -21,7 +19,6 @@
 public class SurfaceBase {
 
     private final static ModPresenceTester undergroundBiomesMod = new ModPresenceTester("UndergroundBiomes");
-    private final static ModPresenceTester abyssalCraftMod = new ModPresenceTester("abyssalcraft");
     // create UBColumnCache only if UB is present
     private static UBColumnCache ubColumnCache = undergroundBiomesMod.present() ? new UBColumnCache() : null;
     protected IBlockState topBlock;
@@ -82,24 +79,12 @@ protected IBlockState getShadowDesertBlock(World world, int i, int j, int x, int
 
     protected IBlockState hcStone(World world, int i, int j, int x, int y, int k) {
 
-        if (abyssalCraftMod.present()) {
-            return ACBlocks.darkstone.getDefaultState();
-        }
-        else {
-
-            return Blocks.STONE.getDefaultState();
-        }
+        return Blocks.STONE.getDefaultState();
     }
 
     protected IBlockState hcCobble(World world, int worldX, int worldZ, int chunkX, int chunkZ, int worldY) {
 
-        if (abyssalCraftMod.present()) {
-
-            return ACBlocks.darkstone_cobblestone.getDefaultState();
-        }
-        else {
-            return Blocks.COBBLESTONE.getDefaultState();
-        }
+        return Blocks.COBBLESTONE.getDefaultState();
     }
 
     public IBlockState getTopBlock() {

diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACBase.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACBase.java
@@ -0,0 +1,29 @@
+package rtg.world.gen.surface.abyssalcraft;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.World;
+
+import com.shinoow.abyssalcraft.api.block.ACBlocks;
+
+import rtg.api.biome.BiomeConfig;
+import rtg.world.gen.surface.SurfaceBase;
+
+public class SurfaceACBase extends SurfaceBase {
+
+    public SurfaceACBase(BiomeConfig config, IBlockState top, IBlockState fill) {
+
+        super(config, top, fill);
+    }
+
+    @Override
+    protected IBlockState hcStone(World world, int i, int j, int x, int y, int k) {
+
+        return ACBlocks.darkstone.getDefaultState();
+    }
+
+    @Override
+    protected IBlockState hcCobble(World world, int worldX, int worldZ, int chunkX, int chunkZ, int worldY) {
+
+        return ACBlocks.darkstone_cobblestone.getDefaultState();
+    }
+}
diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACCoraliumInfestedSwamp.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACCoraliumInfestedSwamp.java
@@ -13,9 +13,8 @@
 import rtg.util.CellNoise;
 import rtg.util.CliffCalculator;
 import rtg.util.OpenSimplexNoise;
-import rtg.world.gen.surface.SurfaceBase;
 
-public class SurfaceACCoraliumInfestedSwamp extends SurfaceBase {
+public class SurfaceACCoraliumInfestedSwamp extends SurfaceACBase {
 
     public SurfaceACCoraliumInfestedSwamp(BiomeConfig config, IBlockState top, IBlockState filler) {
 

diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklands.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklands.java
@@ -14,9 +14,8 @@
 import rtg.util.CellNoise;
 import rtg.util.CliffCalculator;
 import rtg.util.OpenSimplexNoise;
-import rtg.world.gen.surface.SurfaceBase;
 
-public class SurfaceACDarklands extends SurfaceBase {
+public class SurfaceACDarklands extends SurfaceACBase {
 
     private boolean beach;
     private IBlockState beachBlock;

diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsForest.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsForest.java
@@ -14,9 +14,8 @@
 import rtg.util.CellNoise;
 import rtg.util.CliffCalculator;
 import rtg.util.OpenSimplexNoise;
-import rtg.world.gen.surface.SurfaceBase;
 
-public class SurfaceACDarklandsForest extends SurfaceBase {
+public class SurfaceACDarklandsForest extends SurfaceACBase {
 
     private boolean beach;
     private IBlockState beachBlock;

diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsHighland.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsHighland.java
@@ -14,9 +14,8 @@
 import rtg.util.CellNoise;
 import rtg.util.CliffCalculator;
 import rtg.util.OpenSimplexNoise;
-import rtg.world.gen.surface.SurfaceBase;
 
-public class SurfaceACDarklandsHighland extends SurfaceBase {
+public class SurfaceACDarklandsHighland extends SurfaceACBase {
 
     private IBlockState mixBlockTop;
     private byte mixBlockTopMeta;

diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsMountains.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsMountains.java
@@ -15,9 +15,8 @@
 import rtg.util.CellNoise;
 import rtg.util.CliffCalculator;
 import rtg.util.OpenSimplexNoise;
-import rtg.world.gen.surface.SurfaceBase;
 
-public class SurfaceACDarklandsMountains extends SurfaceBase {
+public class SurfaceACDarklandsMountains extends SurfaceACBase {
 
     private boolean beach;
     private IBlockState beachBlock;

diff --git a/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsPlains.java b/src/main/java/rtg/world/gen/surface/abyssalcraft/SurfaceACDarklandsPlains.java
@@ -13,9 +13,8 @@
 import rtg.util.CellNoise;
 import rtg.util.CliffCalculator;
 import rtg.util.OpenSimplexNoise;
-import rtg.world.gen.surface.SurfaceBase;
 
-public class SurfaceACDarklandsPlains extends SurfaceBase {
+public class SurfaceACDarklandsPlains extends SurfaceACBase {
 
     public SurfaceACDarklandsPlains(BiomeConfig config, IBlockState top, IBlockState filler) {