From 734847db68fa50aff9b8db18e8ec833e457c0847 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 9 Aug 2021 09:38:52 -0400 Subject: [PATCH] Object tweaks & mantle fixes --- .../java/com/volmit/iris/engine/mantle/EngineMantle.java | 8 ++++++++ .../engine/mantle/components/MantleObjectComponent.java | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java index f025eea32..604b709e4 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -34,6 +34,7 @@ import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.B; +import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.mantle.Mantle; @@ -218,4 +219,11 @@ public interface EngineMantle extends IObjectPlacer { { } + + @BlockCoordinates + default void updateBlock(int x, int y, int z) + { + getMantle().flag(x>>4, z>>4, MantleFlag.UPDATE, true); + getMantle().set(x,y,z,true); + } } diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java index 7a2a11bd2..0624fc793 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java @@ -29,6 +29,7 @@ import com.volmit.iris.engine.object.feature.IrisFeaturePotential; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.RNG; @@ -66,7 +67,6 @@ public class MantleObjectComponent extends IrisMantleComponent { @ChunkCoordinates private void placeObjects(RNG rng, int x, int z, IrisBiome biome, IrisRegion region, Consumer post) { - for (IrisObjectPlacement i : biome.getSurfaceObjects()) { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005)) && rng.chance(getComplex().getObjectChanceStream().get(x << 4, z << 4))) { try { @@ -95,7 +95,8 @@ public class MantleObjectComponent extends IrisMantleComponent { } } } - + + @BlockCoordinates private void placeObject(RNG rng, int x, int z, IrisObjectPlacement objectPlacement, Consumer post) { for (int i = 0; i < objectPlacement.getDensity(); i++) { IrisObject v = objectPlacement.getScale().get(rng, objectPlacement.getObject(getComplex(), rng));