Merge pull request #960 from CocoTheOwner/render-continent

Continent (i.e. heightmap + ocean/land division) render

src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java

@@ -49,6 +49,14 @@ public class IrisRenderer {
                     colorFunction = (x, z) -> renderer.getComplex().getCaveBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
             case HEIGHT ->
                     colorFunction = (x, z) -> Color.getHSBColor(renderer.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
+            case CONTINENT -> {
+                double fluidHeight = renderer.getComplex().getFluidHeight();
+                int deltaHeight = renderer.getMaxHeight() - renderer.getMinHeight();
+                colorFunction = (x, z) -> {
+                    double h = renderer.getComplex().getHeightStream().get(x, z);
+                    return new Color((int) (h * 255d / deltaHeight), 128, h > fluidHeight ? 0 : 255).getRGB();
+                };
+            }
         }
 
         double x, z;

src/main/java/com/volmit/iris/core/gui/components/RenderType.java

@@ -19,5 +19,5 @@
 package com.volmit.iris.core.gui.components;
 
 public enum RenderType {
-    BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, LAYER_LOAD
+    BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, CONTINENT, LAYER_LOAD
 }

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

@@ -154,6 +154,9 @@ public class IrisEntity extends IrisRegistrant {
     @Desc("Create a mob from another plugin, such as Mythic Mobs. Should be in the format of a namespace of PluginName:MobName")
     private String specialType = "";
 
+    @Desc("Set to true if you want to apply all of the settings here to the mob, even though an external plugin has already done so. Scripts are always applied.")
+    private boolean applySettingsToCustomMobAnyways = false;
+
     @Desc("Set the entity type to UNKNOWN, then define a script here which ends with the entity variable (the result). You can use Iris.getLocation() to find the target location. You can spawn any entity this way.")
     @RegistryListResource(IrisScript.class)
     private String spawnerScript = "";
@@ -211,6 +214,10 @@ public class IrisEntity extends IrisRegistrant {
             }
         }
 
+        if (isSpecialType() && !applySettingsToCustomMobAnyways) {
+            return ee;
+        }
+
         if (ee == null) {
             return null;
         }

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

@@ -32,7 +32,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-@Snippet("carving")
+@Snippet("image-map")
 @Accessors(chain = true)
 @NoArgsConstructor
 @AllArgsConstructor
@@ -68,6 +68,7 @@ public class IrisImageMap {
         IrisImage i = imageCache.aquire(() -> data.getImageLoader().load(image));
         if (i == null) {
             Iris.error("NULL IMAGE FOR " + image);
+            return 0;
         }
 
         return IrisInterpolation.getNoise(interpolationMethod, x, z, coordinateScale, (xx, zz) -> rawNoise(i, xx, zz));
@@ -76,11 +77,27 @@ public class IrisImageMap {
     private double rawNoise(IrisImage i, double x, double z) {
         x /= coordinateScale;
         z /= coordinateScale;
-        x = isCentered() ? x + ((i.getWidth() / 2D) * coordinateScale) : x;
-        z = isCentered() ? z + ((i.getHeight() / 2D) * coordinateScale) : z;
-        x = isTiled() ? x % i.getWidth() : x;
-        z = isTiled() ? z % i.getHeight() : z;
+
+        // X and Z are now scaled to the image
+
+        // Add half the image width & height if centered
+        if (isCentered()) {
+            x += i.getWidth() / 2D;
+            z += i.getHeight() / 2D;
+        }
+
+        // If tiled modulo over width and height
+        if (isTiled()) {
+            x = x % i.getWidth();
+            x = x < 0 ? x + i.getWidth() : x; // Fix java's negative modulo shit
+            z = z % i.getHeight();
+            z = z < 0 ? z + i.getHeight() : z; // Fix java's negative modulo shit
+        }
+
+        // Retrieve value from image
         double v = i.getValue(getChannel(), (int) x, (int) z);
+
+        // Return value, or 1 - value if inverted (value is in double set [0, 1] so this will return [0, 1])
         return isInverted() ? 1D - v : v;
     }
 }

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

@@ -30,16 +30,14 @@ import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.interpolation.IrisInterpolation;
 import com.volmit.iris.util.json.JSONObject;
-import com.volmit.iris.util.math.AxisAlignedBB;
-import com.volmit.iris.util.math.BlockPosition;
-import com.volmit.iris.util.math.Position2;
-import com.volmit.iris.util.math.RNG;
+import com.volmit.iris.util.math.*;
 import com.volmit.iris.util.matter.MatterMarker;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
 import com.volmit.iris.util.plugin.VolmitSender;
 import com.volmit.iris.util.scheduling.IrisLock;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
+import com.volmit.iris.util.stream.ProceduralStream;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -496,6 +494,30 @@ 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;
+            }
+        }
+        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,9 @@ public class IrisObjectPlacement {
     private double snow = 0;
     @Desc("Whether or not this object can be targeted by a dolphin.")
     private boolean isDolphinTarget = false;
+    @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;
     @MinNumber(0)
     @MaxNumber(1)
     @Desc("The chance for this to place in a chunk. If you need multiple per chunk, set this to 1 and use density.")

src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java

@@ -23,10 +23,7 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
-import com.volmit.iris.util.decree.DecreeContext;
-import com.volmit.iris.util.decree.DecreeContextHandler;
-import com.volmit.iris.util.decree.DecreeNode;
-import com.volmit.iris.util.decree.DecreeParameter;
+import com.volmit.iris.util.decree.*;
 import com.volmit.iris.util.decree.annotations.Decree;
 import com.volmit.iris.util.decree.exceptions.DecreeParsingException;
 import com.volmit.iris.util.format.C;
@@ -381,6 +378,12 @@ public class VirtualDecreeCommand {
             return false;
         }
 
+        DecreeOrigin origin = type.getDeclaredAnnotation(Decree.class).origin();
+        if (origin.validFor(sender)) {
+            sender.sendMessage(C.RED + "This command has to be sent from another origin: " + C.GOLD + origin);
+            return false;
+        }
+
         Iris.debug("@ " + getPath() + " with " + args.toString(", "));
         if (isNode()) {
             Iris.debug("Invoke " + getPath() + "(" + args.toString(",") + ") at ");