redid focus / added coco's focus

src/main/java/com/volmit/iris/engine/IrisComplex.java

@@ -82,7 +82,8 @@ public class IrisComplex implements DataProvider {
     private ProceduralStream<IrisDecorator> shoreSurfaceDecoration;
     private ProceduralStream<BlockData> rockStream;
     private ProceduralStream<BlockData> fluidStream;
-    private IrisBiome focus;
+    private IrisBiome focusBiome;
+    private IrisRegion focusRegion;
 
     public IrisComplex(Engine engine) {
         this(engine, false);
@@ -97,14 +98,15 @@ public class IrisComplex implements DataProvider {
         double height = engine.getHeight();
         fluidHeight = engine.getDimension().getFluidHeight();
         generators = new KMap<>();
-        focus = engine.getFocus();
+        focusBiome = engine.getFocus();
+        focusRegion = engine.getFocusRegion();
         KMap<InferredType, ProceduralStream<IrisBiome>> inferredStreams = new KMap<>();
 
-        if (focus != null) {
+        if (focusBiome != null) {
-            focus.setInferredType(InferredType.LAND);
+            focusBiome.setInferredType(InferredType.LAND);
+            focusRegion = findRegion(focusBiome, engine);
         }
 
-        IrisRegion focusRegion = focus != null ? findRegion(focus, engine) : null;
         //@builder
         engine.getDimension().getRegions().forEach((i) -> data.getRegionLoader().load(i)
                 .getAllBiomes(this).forEach((b) -> b
@@ -153,25 +155,25 @@ public class IrisComplex implements DataProvider {
                 .selectRarity(data.getBiomeLoader().loadAll(r.getShoreBiomes(), (t) -> t.setInferredType(InferredType.SHORE)))
         ).convertAware2D(ProceduralStream::get).cache2D("shoreBiomeStream", engine, cacheSize);
         inferredStreams.put(InferredType.SHORE, shoreBiomeStream);
-        bridgeStream = focus != null ? ProceduralStream.of((x, z) -> focus.getInferredType(),
+        bridgeStream = focusBiome != null ? ProceduralStream.of((x, z) -> focusBiome.getInferredType(),
-                Interpolated.of(a -> 0D, a -> focus.getInferredType())) :
+                Interpolated.of(a -> 0D, a -> focusBiome.getInferredType())) :
                 engine.getDimension().getContinentalStyle().create(rng.nextParallelRNG(234234565), getData())
                         .bake().scale(1D / engine.getDimension().getContinentZoom()).bake().stream()
                         .convert((v) -> v >= engine.getDimension().getLandChance() ? InferredType.SEA : InferredType.LAND)
                         .cache2D("bridgeStream", engine, cacheSize);
-        baseBiomeStream = focus != null ? ProceduralStream.of((x, z) -> focus,
+        baseBiomeStream = focusBiome != null ? ProceduralStream.of((x, z) -> focusBiome,
-                Interpolated.of(a -> 0D, a -> focus)) :
+                Interpolated.of(a -> 0D, a -> focusBiome)) :
                 bridgeStream.convertAware2D((t, x, z) -> inferredStreams.get(t).get(x, z))
                         .convertAware2D(this::implode)
                     .cache2D("baseBiomeStream", engine, cacheSize);
         heightStream = ProceduralStream.of((x, z) -> {
-            IrisBiome b = focus != null ? focus : baseBiomeStream.get(x, z);
+            IrisBiome b = focusBiome != null ? focusBiome : baseBiomeStream.get(x, z);
             return getHeight(engine, b, x, z, engine.getSeedManager().getHeight());
         }, Interpolated.DOUBLE).clamp(0, engine.getHeight()).cache2D("heightStream", engine, cacheSize);
         roundedHeighteightStream = heightStream.round();
         slopeStream = heightStream.slope(3).cache2D("slopeStream", engine, cacheSize);
-        trueBiomeStream = focus != null ? ProceduralStream.of((x, y) -> focus, Interpolated.of(a -> 0D,
+        trueBiomeStream = focusBiome != null ? ProceduralStream.of((x, y) -> focusBiome, Interpolated.of(a -> 0D,
-                        b -> focus))
+                        b -> focusBiome))
                 .cache2D("trueBiomeStream-focus", engine, cacheSize) : heightStream
                 .convertAware2D((h, x, z) ->
                         fixBiomeType(h, baseBiomeStream.get(x, z),

src/main/java/com/volmit/iris/engine/IrisEngine.java

@@ -35,12 +35,7 @@ import com.volmit.iris.engine.framework.EngineWorldManager;
 import com.volmit.iris.engine.framework.SeedManager;
 import com.volmit.iris.engine.framework.WrongEngineBroException;
 import com.volmit.iris.engine.mantle.EngineMantle;
-import com.volmit.iris.engine.object.IrisBiome;
+import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.object.IrisBiomePaletteLayer;
-import com.volmit.iris.engine.object.IrisDecorator;
-import com.volmit.iris.engine.object.IrisEngineData;
-import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.IrisObjectPlacement;
 import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.util.atomics.AtomicRollingSequence;
 import com.volmit.iris.util.collection.KMap;
@@ -485,6 +480,14 @@ public class IrisEngine implements Engine {
         return getData().getBiomeLoader().load(getDimension().getFocus());
     }
 
+    @Override
+    public IrisRegion getFocusRegion() {
+        if (getDimension().getFocusRegion() == null || getDimension().getFocusRegion().trim().isEmpty()) {
+            return null;
+        }
+
+        return getData().getRegionLoader().load(getDimension().getFocusRegion());
+    }
     @Override
     public void fail(String error, Throwable e) {
         failing = true;

src/main/java/com/volmit/iris/engine/framework/Engine.java

@@ -518,6 +518,9 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
 
     IrisBiome getFocus();
 
+    IrisRegion getFocusRegion();
+
+
     IrisEngineData getEngineData();
 
     default IrisBiome getSurfaceBiome(Chunk c) {
@@ -765,6 +768,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
         return new PlacedObject(null, getData().getObjectLoader().load(object), id, x, z);
     }
 
+
     int getCacheID();
 
     default IrisBiome getBiomeOrMantle(Location l) {

src/main/java/com/volmit/iris/engine/object/IrisDimension.java

@@ -161,7 +161,7 @@ public class IrisDimension extends IrisRegistrant {
     @RegistryListResource(IrisBiome.class)
     @Desc("Keep this either undefined or empty. Setting any biome name into this will force iris to only generate the specified biome. Great for testing.")
     private String focus = "";
-    @RegistryListResource(IrisBiome.class)
+    @RegistryListResource(IrisRegion.class)
     @Desc("Keep this either undefined or empty. Setting any region name into this will force iris to only generate the specified region. Great for testing.")
     private String focusRegion = "";
     @MinNumber(0.0001)