From 47ca36397d5d4e2a236630676c0033364612a4d9 Mon Sep 17 00:00:00 2001
From: iLexiconn <ilexiconn@gmail.com>
Date: Sun, 13 Nov 2016 21:19:07 +0100
Subject: [PATCH] Let /clearchunk use the spawn list of the generator

---
 build.gradle                                                 | 4 ++--
 src/main/java/mmd/orespawn/command/ClearChunkCommand.java    | 4 ++--
 src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 99a9969..c2cb7f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,9 +55,9 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = "1.10.2-12.18.1.2011"
+    version = "1.10.2-12.18.2.2125"
     runDir = "run"
-    mappings = "snapshot_20160820"
+    mappings = "snapshot_20161111"
     makeObfSourceJar = false
 }
 
diff --git a/src/main/java/mmd/orespawn/command/ClearChunkCommand.java b/src/main/java/mmd/orespawn/command/ClearChunkCommand.java
index ab89b8a..17a99d7 100644
--- a/src/main/java/mmd/orespawn/command/ClearChunkCommand.java
+++ b/src/main/java/mmd/orespawn/command/ClearChunkCommand.java
@@ -1,11 +1,11 @@
 package mmd.orespawn.command;
 
+import mmd.orespawn.world.OreSpawnWorldGenerator;
 import net.minecraft.block.Block;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
@@ -38,7 +38,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
                     BlockPos pos = new BlockPos(x, y, z);
                     Block block = player.worldObj.getBlockState(pos).getBlock();
 
-                    if (block == Blocks.STONE || block == Blocks.DIRT || block == Blocks.GRASS || block == Blocks.SAND || block == Blocks.SANDSTONE || block == Blocks.BEDROCK) {
+                    if (OreSpawnWorldGenerator.SPAWN_BLOCKS.contains(block)) {
                         player.worldObj.setBlockToAir(pos);
                     }
                 }
diff --git a/src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java b/src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java
index d127f55..f1bd99d 100644
--- a/src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java
+++ b/src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java
@@ -47,7 +47,7 @@ public class OreSpawnWorldGenerator implements IWorldGenerator {
     private static final int MAX_CACHE_SIZE = 1024;
     private static final Map<Vec3i, Map<BlockPos, IBlockState>> OVERFLOW_CACHE = new HashMap<>(MAX_CACHE_SIZE);
     private static final Deque<Vec3i> CACHE_ORDER = new LinkedList<>();
-    private static final HashSet<Block> SPAWN_BLOCKS = new HashSet<>();
+    public static final HashSet<Block> SPAWN_BLOCKS = new HashSet<>();
     private static final Set<Integer> KNOWN_DIMENSIONS = new HashSet<>();
 
     private static final Predicate<IBlockState> STONE_PREDICATE = input -> {