Merge pull request #756 from VolmitSoftware/Development

Development 2.0.1-1.18.X Merge

build.gradle

@@ -25,7 +25,7 @@ plugins {
 }
 
 group 'com.volmit.iris'
-version '2.0.0-1.18.X'
+version '2.0.1-1.18.X'
 def nmsVersion = "1.18.1"
 def apiVersion = '1.18'
 def spigotJarVersion = '1.18.1-R0.1-SNAPSHOT'
@@ -39,6 +39,7 @@ registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'
 registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins')
 registerCustomOutputTask('Coco', 'D://Documents/MC/plugins')
 registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
+registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.18.1/plugins')
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/Documents/development/server/plugins')
 registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')

listing.json

@@ -5,4 +5,6 @@
   "redstone IrisDimensions/redstone",
   "mars IrisDimensions/mars",
   "example IrisDimensions/example"
+  "newhorizons IrisDimensions/newhorizons",
+  "theend IrisDimensions/theend"
 ]

src/main/java/com/volmit/iris/core/commands/CommandStudio.java

@@ -70,6 +70,7 @@
 import com.volmit.iris.util.scheduling.jobs.QueueJob;
 import com.volmit.iris.util.scheduling.jobs.SingleJob;
 import io.papermc.lib.PaperLib;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.FluidCollisionMode;
@@ -81,6 +82,7 @@
 import org.bukkit.util.BlockVector;
 import org.bukkit.util.Vector;
 
+import java.awt.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -93,6 +95,7 @@
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 @Decree(name = "studio", aliases = {"std", "s"}, description = "Studio Commands", studio = true)

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

@@ -127,7 +127,7 @@ public IrisEngine(EngineTarget target, boolean studio) {
         context = new IrisContext(this);
         cleaning = new AtomicBoolean(false);
         context.touch();
-        Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + 256 + " height) Seed: " + getSeedManager().getSeed());
+        Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + target.getDimension().getDimensionHeight() + " height) Seed: " + getSeedManager().getSeed());
         getData().setEngine(this);
         minHeight = 0;
         failing = false;

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

@@ -102,10 +102,6 @@ public class IrisBiome extends IrisRegistrant implements IRare {
     private KList<IrisBlockDrops> blockDrops = new KList<>();
     @Desc("Reference loot tables in this area")
     private IrisLootReference loot = new IrisLootReference();
-    @MinNumber(0.0001)
-    @DependsOn({"biomeStyle", "biomeZoom", "biomeScatter"})
-    @Desc("This zooms in the biome colors if multiple derivatives are chosen")
-    private double biomeZoom = 1;
     @Desc("Layers no longer descend from the surface block, they descend from the max possible height the biome can produce (constant) creating mesa like layers.")
     private boolean lockLayers = false;
     @Desc("The max layers to iterate below the surface for locked layer biomes (mesa).")

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

@@ -209,16 +209,17 @@ public void apply(Player p, Engine g) {
 
             part.setY(Math.round(g.getHeight(part.getBlockX(), part.getBlockZ())) + 1);
             part.add(RNG.r.d(), 0, RNG.r.d());
+            int offset = p.getWorld().getMinHeight();
             if(extra != 0) {
-                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset),
+                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset),
                     part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
                     randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,
                     randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ,
                     extra));
             } else {
-                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset), part.getZ(),
+                J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
                     randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,
@@ -266,16 +267,17 @@ public void apply(Entity p) {
         if(particleEffect != null) {
             Location part = p.getLocation().clone().add(0, 0.25, 0).add(new Vector(1, 1, 1).multiply(RNG.r.d())).subtract(new Vector(1, 1, 1).multiply(RNG.r.d()));
             part.add(RNG.r.d(), 0, RNG.r.d());
+            int offset = p.getWorld().getMinHeight();
             if(extra != 0) {
-                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset),
+                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset),
                     part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
                     randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,
                     randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ,
                     extra));
             } else {
-                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset), part.getZ(),
+                J.s(() -> p.getWorld().spawnParticle(particleEffect, part.getX(), part.getY() + offset + RNG.r.i(particleOffset), part.getZ(),
                     particleCount,
                     randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX,
                     randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY,

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

@@ -93,10 +93,6 @@ public class IrisRegion extends IrisRegistrant implements IRare {
     @ArrayType(min = 1, type = IrisBlockDrops.class)
     @Desc("Define custom block drops for this region")
     private KList<IrisBlockDrops> blockDrops = new KList<>();
-    @MinNumber(0.0001)
-    @MaxNumber(1)
-    @Desc("The shore ration (How much percent of land should be a shore)")
-    private double shoreRatio = 0.13;
     @RegistryListResource(IrisSpawner.class)
     @ArrayType(min = 1, type = IrisObjectPlacement.class)
     @Desc("Objects define what schematics (iob files) iris will place in this region")
@@ -124,10 +120,6 @@ public class IrisRegion extends IrisRegistrant implements IRare {
     @MinNumber(0.0001)
     @Desc("How large cave biomes are in this region")
     private double caveBiomeZoom = 1;
-    @MinNumber(0.0001)
-    @MaxNumber(1)
-    @Desc("The biome implosion ratio, how much to implode biomes into children (chance)")
-    private double biomeImplosionRatio = 0.4;
     @Desc("Carving configuration for the dimension")
     private IrisCarving carving = new IrisCarving();
     @Desc("Configuration of fluid bodies such as rivers & lakes")
@@ -158,22 +150,6 @@ public class IrisRegion extends IrisRegistrant implements IRare {
     private IrisGeneratorStyle riverStyle = NoiseStyle.VASCULAR_THIN.style().zoomed(7.77);
     @Desc("The style of lakes")
     private IrisGeneratorStyle lakeStyle = NoiseStyle.CELLULAR_IRIS_THICK.style();
-    @Desc("The style of river chances")
-    private IrisGeneratorStyle riverChanceStyle = NoiseStyle.SIMPLEX.style().zoomed(4);
-    @Desc("Generate lakes in this region")
-    private boolean lakes = true;
-    @Desc("Generate rivers in this region")
-    private boolean rivers = true;
-    @MinNumber(1)
-    @Desc("Generate lakes in this region")
-    private int lakeRarity = 22;
-    @MinNumber(1)
-    @Desc("Generate rivers in this region")
-    private int riverRarity = 3;
-    @MinNumber(0)
-    @MaxNumber(1)
-    @Desc("Generate rivers in this region")
-    private double riverThickness = 0.1;
     @Desc("A color for visualizing this region with a color. I.e. #F13AF5. This will show up on the map.")
     private String color = null;
     @Desc("Collection of ores to be generated")