- more refactors

- tweak how biome container is generated
- block carvers from acting on chunks containing surface structures
- added spawn type option

src/main/java/com/terraforged/fm/template/StructureUtils.java

@@ -0,0 +1,38 @@
+package com.terraforged.fm.template;
+
+import com.google.common.collect.ImmutableList;
+import it.unimi.dsi.fastutil.longs.LongSet;
+import net.minecraft.world.chunk.IChunk;
+import net.minecraft.world.gen.feature.structure.Structure;
+
+import java.util.List;
+import java.util.Map;
+
+public class StructureUtils {
+
+    public static final List<Structure<?>> SURFACE_STRUCTURES = ImmutableList.of(
+            Structure.VILLAGE,
+            Structure.JUNGLE_TEMPLE,
+            Structure.PILLAGER_OUTPOST,
+            Structure.SWAMP_HUT,
+            Structure.IGLOO,
+            Structure.DESERT_PYRAMID,
+            Structure.WOODLAND_MANSION
+    );
+
+    public static boolean hasOvergroundStructure(IChunk chunk) {
+        Map<String, LongSet> references = chunk.getStructureReferences();
+        for (Structure<?> structure : SURFACE_STRUCTURES) {
+            LongSet refs = references.get(structure.getStructureName());
+            if (refs != null && refs.size() > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean hasStructure(IChunk chunk, Structure<?> structure) {
+        LongSet refs = chunk.getStructureReferences().get(structure.getStructureName());
+        return refs != null && refs.size() > 0;
+    }
+}

src/main/java/com/terraforged/fm/template/Template.java

@@ -13,7 +13,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.chunk.IChunk;
-import net.minecraft.world.gen.feature.Feature;
 import net.minecraftforge.common.util.Constants;
 
 import java.io.IOException;
@@ -34,13 +33,11 @@ public Template(List<BlockInfo> blocks) {
     public boolean paste(IWorld world, BlockPos origin, Mirror mirror, Rotation rotation, PasteConfig config) {
         if (config.checkBounds) {
             IChunk chunk = world.getChunk(origin);
-            if (chunk == null || chunk.getStructureReferences(Feature.VILLAGE.getStructureName()).isEmpty()) {
-                return pasteNormal(world, origin, mirror, rotation, config);
+            if (StructureUtils.hasOvergroundStructure(chunk)) {
+                return pasteWithBoundsCheck(world, origin, mirror, rotation, config);
             }
-            return pasteWithBoundsCheck(world, origin, mirror, rotation, config);
-        } else {
-            return pasteNormal(world, origin, mirror, rotation, config);
         }
+        return pasteNormal(world, origin, mirror, rotation, config);
     }
 
     public boolean pasteNormal(IWorld world, BlockPos origin, Mirror mirror, Rotation rotation, PasteConfig config) {
@@ -61,8 +58,8 @@ public boolean pasteNormal(IWorld world, BlockPos origin, Mirror mirror, Rotatio
                 placeBase(world, pos, block.state, config.baseDepth);
             }
 
+            world.setBlockState(pos, state, 2);
             placed = true;
-            world.setBlockState(pos, block.state, 2);
         }
         return placed;
     }
@@ -185,7 +182,7 @@ private static List<Template.BlockInfo> relativize(Template.BlockInfo[] blocks)
             if (origin == null) {
                 origin = block.pos;
                 lowestSolid = block.pos.getY();
-            }else if (block.pos.getY() < lowestSolid) {
+            } else if (block.pos.getY() < lowestSolid) {
                 origin = block.pos;
                 lowestSolid = block.pos.getY();
             } else if (block.pos.getY() == lowestSolid) {