Marker destruction

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

@@ -28,6 +28,7 @@ import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.engine.object.annotations.Snippet;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.matter.MatterMarker;
 import com.volmit.iris.util.matter.slices.MarkerMatter;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -63,6 +64,7 @@ public class IrisEntitySpawn implements IRare {
     @Desc("The max of this entity to spawn")
     private int maxSpawns = 1;
     private transient IrisSpawner referenceSpawner;
+    private transient IrisMarker referenceMarker;
 
     public int spawn(Engine gen, Chunk c, RNG rng) {
         int spawns = minSpawns == maxSpawns ? minSpawns : rng.i(Math.min(minSpawns, maxSpawns), Math.max(minSpawns, maxSpawns));
@@ -110,6 +112,12 @@ public class IrisEntitySpawn implements IRare {
 
         World world = gen.getWorld().realWorld();
         if (spawns > 0) {
+
+            if(referenceMarker != null)
+            {
+                gen.getMantle().getMantle().remove(c.getX(), c.getY(), c.getZ(), MatterMarker.class);
+            }
+
             for (int id = 0; id < spawns; id++) {
                 Location l = c.toLocation(world).add(0, 1, 0);
 

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

@@ -24,6 +24,7 @@ import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.json.JSONObject;
+import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.plugin.VolmitSender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -46,6 +47,14 @@ public class IrisMarker extends IrisRegistrant {
     @Desc("Remove this marker when the block it's assigned to is changed.")
     private boolean removeOnChange = true;
 
+    @Desc("If this marker is used, what is the chance it removes itself. For example 25% (0.25) would mean that on average 4 uses will remove a specific marker. Set this below 0 (-1) to never exhaust & set this to 1 or higher to always exhaust on first use.")
+    private double exhaustionChance = 0.33;
+
+    public boolean shouldExhaust()
+    {
+        return RNG.r.chance(exhaustionChance);
+    }
+
     @Override
     public String getFolderName() {
         return "markers";

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

@@ -504,7 +504,7 @@ public class IrisObject extends IrisRegistrant {
     }
 
     public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, Consumer<BlockPosition> listener, CarveResult c, IrisData rdata) {
-        IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(IrisContext.get().getEngine(), rng, x, yv, z, config, oplacer) : oplacer;
+        IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(oplacer.getEngine() == null ? IrisContext.get().getEngine() : oplacer.getEngine(), rng, x, yv, z, config, oplacer) : oplacer;
 
         if (config.isSmartBore()) {
             ensureSmartBored(placer.isDebugSmartBore());
@@ -667,9 +667,19 @@ public class IrisObject extends IrisRegistrant {
 
                     for(BlockVector i : getBlocks().k().shuffle())
                     {
+                        if(max <= 0)
+                        {
+                            break;
+                        }
+
                         BlockData data = getBlocks().get(i);
 
                         for (BlockData k : j.getMark(rdata)) {
+                            if(max <= 0)
+                            {
+                                break;
+                            }
+
                             if (j.isExact() ? k.matches(data) : k.getMaterial().equals(data.getMaterial())) {
                                 boolean a = !blocks.containsKey(new BlockVector(i.clone().add(new BlockVector(0, 1, 0))));
                                 boolean fff = !blocks.containsKey(new BlockVector(i.clone().add(new BlockVector(0, 2, 0))));
@@ -677,6 +687,7 @@ public class IrisObject extends IrisRegistrant {
                                 if((j.isEmptyAbove() && a && fff) || !j.isEmptyAbove())
                                 {
                                     markers.put(i, j.getMarker());
+                                    max--;
                                 }
                             }
                         }

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

@@ -38,6 +38,9 @@ import org.bukkit.World;
 @Desc("Represents an entity spawn during initial chunk generation")
 @Data
 public class IrisSpawner extends IrisRegistrant {
+
+    private transient IrisMarker referenceMarker;
+
     @ArrayType(min = 1, type = IrisEntitySpawn.class)
     @Desc("The entity spawns to add")
     private KList<IrisEntitySpawn> spawns = new KList<>();