Bring ores closer in line with vanilla generation

Author: dordsor21

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/OreGen.java

@@ -21,12 +21,38 @@ public class OreGen implements Resource {
     private final Extent extent;
     private final Mask mask;
     private final MutableBlockVector3 mutable = new MutableBlockVector3();
+    private final boolean triangular;
 
     private final double ONE_2 = 1 / 2F;
     private final double ONE_8 = 1 / 8F;
     private final double ONE_16 = 1 / 16F;
 
     public OreGen(Extent extent, Mask mask, Pattern pattern, int size, int minY, int maxY) {
+        this(extent, mask, pattern, size, minY, maxY, false);
+    }
+
+    /**
+     * Generate ore-like deposits with the given pattern and settings
+     *
+     * @param extent             Extent to write to
+     * @param mask               mask of where to place
+     * @param pattern            pattern to place
+     * @param size               maximum size of deposits
+     * @param minY               min Y to consider generation from (important for triangular generation)
+     * @param maxY               max Y to consider generation from (important for triangular generation)
+     * @param triangular         if a triangular distribution of ores should be used (rather than
+     * @throws WorldEditException on error
+     * @since TODO
+     */
+    public OreGen(
+            Extent extent,
+            Mask mask,
+            Pattern pattern,
+            int size,
+            int minY,
+            int maxY,
+            boolean triangular
+    ) {
         this.maxSize = size;
         this.maxSizeO8 = size * ONE_8;
         this.maxSizeO16 = size * ONE_16;
@@ -36,11 +62,20 @@ public OreGen(Extent extent, Mask mask, Pattern pattern, int size, int minY, int
         this.mask = mask;
         this.pattern = pattern;
         this.extent = extent;
+        this.triangular = triangular;
     }
 
     @Override
     public boolean spawn(Random rand, int x, int z) throws WorldEditException {
-        int y = rand.nextInt(maxY - minY) + minY;
+        int y;
+        if (this.triangular) {
+            int range = maxY - minY;
+            int mid = range / 2;
+            int upperMid = range - mid;
+            y = minY + rand.nextInt(mid) + rand.nextInt(upperMid);
+        } else {
+            y = rand.nextInt(maxY - minY) + minY;
+        }
         if (!mask.test(mutable.setComponents(x, y, z))) {
             return false;
         }

worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java

@@ -622,10 +622,12 @@ public void ores(
             LocalSession session,
             EditSession editSession,
             @Selection Region region,
-            @Arg(desc = "Mask") Mask mask
+            @Arg(desc = "Mask") Mask mask,
+            @Switch(name = 'b', desc = "Make all ores deepslate equivalent for y<0") boolean deepslateBelowZero,
+            @Switch(name = 'd', desc = "Make all ores deepslate equivalent when placed into deepslate, tuff, etc.") boolean deepslateWhereDeepslate
     ) throws WorldEditException {
         new MaskTraverser(mask).setNewExtent(editSession);
-        editSession.addOres(region, mask);
+        editSession.addOres(region, mask, deepslateBelowZero, deepslateWhereDeepslate);
         actor.print(Caption.of("fawe.worldedit.visitor.visitor.block", editSession.getBlockChangeCount()));
     }