Merge pull request #911 from VolmitSoftware/Development

Development

build.gradle

@@ -24,7 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.3.1-1.19.2' // Needs to be version specific
+version '2.3.3-1.19.2' // Needs to be version specific
 def nmsVersion = "1.19.2" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]

settings.gradle

@@ -20,7 +20,6 @@ pluginManagement {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
-        maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
     }
 }
 rootProject.name = 'Iris'

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

@@ -633,7 +633,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
                 }
             });
 
-            /*KList<ItemStack> d = new KList<>();
+            KList<ItemStack> d = new KList<>();
             IrisBiome b = getEngine().getBiome(e.getBlock().getLocation().clone().subtract(0, getEngine().getWorld().minHeight(), 0));
             List<IrisBlockDrops> dropProviders = filterDrops(b.getBlockDrops(), e, getData());
 
@@ -652,7 +652,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             if(d.isNotEmpty()) {
                 World w = e.getBlock().getWorld();
                 J.s(() -> d.forEach(item -> w.dropItemNaturally(e.getBlock().getLocation().clone().add(.5, .5, .5), item)));
-            }*/
+            }
         }
     }
 

src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java

@@ -62,8 +62,16 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                     }
                 }
 
-                if(decorator.getForceBlock() != null)
+                if(decorator.getForceBlock() != null) {
                     data.set(x, height, z, fixFaces(decorator.getForceBlock().getBlockData(getData()), x, height, z));
+                } else if(!decorator.isForcePlace()) {
+                    if(decorator.getWhitelist() != null && decorator.getWhitelist().stream().noneMatch(d -> d.getBlockData(getData()).equals(bdx))) {
+                        return;
+                    }
+                    if(decorator.getBlacklist() != null && decorator.getWhitelist().stream().anyMatch(d -> d.getBlockData(getData()).equals(bdx))) {
+                        return;
+                    }
+                }
 
                 if(bd instanceof Bisected) {
                     bd = bd.clone();
@@ -77,8 +85,9 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
                     ((Bisected) bd).setHalf(Bisected.Half.BOTTOM);
                 }
 
-                data.set(x, height + 1, z, fixFaces(bd, x, height + 1, z));
-
+                if(B.isAir(data.get(x, height + 1, z))) {
+                    data.set(x, height + 1, z, fixFaces(bd, x, height + 1, z));
+                }
             } else {
                 if(height < getDimension().getFluidHeight()) {
                     max = getDimension().getFluidHeight();

src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java

@@ -19,6 +19,7 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.engine.object.IrisEffect;
 import com.volmit.iris.engine.object.IrisRegion;
@@ -48,6 +49,9 @@ public class EnginePlayer {
     public void tick() {
         sample();
 
+        if(!IrisSettings.get().getWorld().isEffectSystem())
+            return;
+
         J.a(() -> {
             if(region != null) {
                 for(IrisEffect j : region.getEffects()) {

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

@@ -55,6 +55,12 @@ public class IrisDecorator {
     private boolean forcePlace = false;
     @Desc("Forced the surface block of this decorant to be the specified block. Assumes forcePlace.")
     private IrisBlockData forceBlock;
+    @ArrayType(min = 1, type = IrisBlockData.class)
+    @Desc("When set, the decorator can only place onto any of these blocks.")
+    private KList<IrisBlockData> whitelist;
+    @ArrayType(min = 1, type = IrisBlockData.class)
+    @Desc("When set, the decorator will never place onto any of these blocks.")
+    private KList<IrisBlockData> blacklist;
     @DependsOn({"scaleStack", "stackMin", "stackMax"})
     @Desc("If stackMax is set to true, use this to limit its max height for large caverns")
     private int absoluteMaxStack = 30;