Fixed the pregen error!

Patches an issue with slope conditions when placing with commands

build.gradle

@@ -24,7 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.5.0-1.19.4'
+version '2.5.1-1.19.4'
 def nmsVersion = "1.19.4" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]

src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java

@@ -101,7 +101,8 @@ public class IrisPregenerator {
                         eta, M.ms() - startTime.get(), currentGeneratorMethod.get());
 
                 if (cl.flip()) {
-                    Iris.info("Pregen: " + Form.f(generated.get()) + " of " + Form.f(totalChunks.get()) + " (" + Form.pc((double) generated.get() / (double) totalChunks.get(), 0) + ") " + Form.f((int) chunksPerSecond.getAverage()) + "/s ETA: " + Form.duration((double) eta, 2));
+                    double percentage = ((double) generated.get() / (double) totalChunks.get()) * 100;
+                    Iris.info("Pregen: " + Form.f(generated.get()) + " of " + Form.f(totalChunks.get()) + " (%.0f%%) " + Form.f((int) chunksPerSecond.getAverage()) + "/s ETA: " + Form.duration((double) eta, 2), percentage);
                 }
 
                 return 1000;

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

@@ -494,29 +494,37 @@ public class IrisObject extends IrisRegistrant {
     public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, BiConsumer<BlockPosition, BlockData> listener, CarveResult c, IrisData rdata) {
         IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(oplacer.getEngine() == null ? IrisContext.get().getEngine() : oplacer.getEngine(), rng, x, yv, z, config, oplacer) : oplacer;
 
-        // Rotation calculation
-        int slopeRotationY = 0;
-        ProceduralStream<Double> heightStream = rdata.getEngine().getComplex().getHeightStream();
-        if (config.isRotateTowardsSlope()) {
-            // Whichever side of the rectangle that bounds the object is lowest is the 'direction' of the slope (simply said).
-            double hNorth = heightStream.get(x, z + ((float)d) / 2);
-            double hEast = heightStream.get(x + ((float)w) / 2, z);
-            double hSouth = heightStream.get(x, z - ((float)d) / 2);
-            double hWest = heightStream.get(x - ((float)w) / 2, z);
-            double min = Math.min(Math.min(hNorth, hEast), Math.min(hSouth, hWest));
-            if (min == hNorth) {
-                slopeRotationY = 0;
-            } else if (min == hEast) {
-                slopeRotationY = 90;
-            } else if (min == hSouth) {
-                slopeRotationY = 180;
-            } else if (min == hWest) {
-                slopeRotationY = 270;
+        if (rdata != null) {
+            // Slope condition
+            if (!config.getSlopeCondition().isDefault() &&
+                    !config.getSlopeCondition().isValid(rdata.getEngine().getComplex().getSlopeStream().get(x, z))) {
+                return -1;
             }
+
+            // Rotation calculation
+            int slopeRotationY = 0;
+            ProceduralStream<Double> heightStream = rdata.getEngine().getComplex().getHeightStream();
+            if (config.isRotateTowardsSlope()) {
+                // Whichever side of the rectangle that bounds the object is lowest is the 'direction' of the slope (simply said).
+                double hNorth = heightStream.get(x, z + ((float) d) / 2);
+                double hEast = heightStream.get(x + ((float) w) / 2, z);
+                double hSouth = heightStream.get(x, z - ((float) d) / 2);
+                double hWest = heightStream.get(x - ((float) w) / 2, z);
+                double min = Math.min(Math.min(hNorth, hEast), Math.min(hSouth, hWest));
+                if (min == hNorth) {
+                    slopeRotationY = 0;
+                } else if (min == hEast) {
+                    slopeRotationY = 90;
+                } else if (min == hSouth) {
+                    slopeRotationY = 180;
+                } else if (min == hWest) {
+                    slopeRotationY = 270;
+                }
+            }
+            double newRotation = config.getRotation().getYAxis().getMin() + slopeRotationY;
+            config.getRotation().setYAxis(new IrisAxisRotationClamp(true, false, newRotation, newRotation, 360));
+            config.getRotation().setEnabled(true);
         }
-        double newRotation = config.getRotation().getYAxis().getMin() + slopeRotationY;
-        config.getRotation().setYAxis(new IrisAxisRotationClamp(true, false, newRotation, newRotation, 360));
-        config.getRotation().setEnabled(true);
 
         if (config.isSmartBore()) {
             ensureSmartBored(placer.isDebugSmartBore());

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

@@ -62,6 +62,8 @@ public class IrisObjectPlacement {
     private double snow = 0;
     @Desc("Whether or not this object can be targeted by a dolphin.")
     private boolean isDolphinTarget = false;
+    @Desc("The slope at which this object can be placed. Range from 0 to 10 by default. Calculated from a 3-block radius from the center of the object placement.")
+    private IrisSlopeClip slopeCondition = new IrisSlopeClip();
     @Desc("Set to true to add the rotation of the direction of the slope of the terrain (wherever the slope is going down) to the y-axis rotation of the object." +
             "Rounded to 90 degrees. Adds the *min* rotation of the y axis as well (to still allow you to rotate objects nicely). Discards *max* and *interval* on *yaxis*")
     private boolean rotateTowardsSlope = false;