Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-25 18:19:14 +00:00
Code Issues Releases Activity

Merge pull request #911 from VolmitSoftware/Development

Browse Source 
Development
This commit is contained in:
Brian Fopiano
2022-09-30 21:19:06 -07:00
committed by GitHub
parent 8331cbe375 f6ea171669
commit 7729ce3753
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@@ -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)));
}*/
}
}
}

10
src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
View File

@@ -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();

6
src/main/java/com/volmit/iris/engine/object/IrisDecorator.java
View File

@@ -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;