From a09829ed4b6676fb7b451694f5d3be870e1340df Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Fri, 27 Aug 2021 10:24:01 -0400 Subject: [PATCH] Updates on their own slice --- .../volmit/iris/engine/framework/Engine.java | 5 +- .../iris/util/matter/slices/UpdateMatter.java | 57 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index 65345080f..8abeaa8f1 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -52,6 +52,7 @@ import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.matter.slices.UpdateMatter; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.ChronoLatch; @@ -243,8 +244,8 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat default void updateChunk(Chunk c) { getMantle().getMantle().raiseFlag(c.getX(), c.getZ(), MantleFlag.UPDATE, () -> J.s(() -> { PrecisionStopwatch p = PrecisionStopwatch.start(); - getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), Boolean.class, (x, y, z, v) -> { - if (v != null && v) { + getMantle().getMantle().iterateChunk(c.getX(), c.getZ(), UpdateMatter.MatterUpdate.class, (x, y, z, v) -> { + if (v != null && v.isUpdate()) { int vx = x & 15; int vz = z & 15; update(x, y, z, c, new RNG(Cache.key(c.getX(), c.getZ()))); diff --git a/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java new file mode 100644 index 000000000..585f1641d --- /dev/null +++ b/src/main/java/com/volmit/iris/util/matter/slices/UpdateMatter.java @@ -0,0 +1,57 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.util.matter.slices; + +import com.volmit.iris.util.matter.Sliced; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +@Sliced +public class UpdateMatter extends RawMatter { + public static final MatterUpdate ON = new MatterUpdate(true); + public static final MatterUpdate OFF = new MatterUpdate(false); + + public UpdateMatter() { + this(1, 1, 1); + } + + public UpdateMatter(int width, int height, int depth) { + super(width, height, depth, MatterUpdate.class); + } + + @Override + public void writeNode(MatterUpdate b, DataOutputStream dos) throws IOException { + dos.writeBoolean(b.update); + } + + @Override + public MatterUpdate readNode(DataInputStream din) throws IOException { + return din.readBoolean() ? ON : OFF; + } + + @Data + @AllArgsConstructor + public static class MatterUpdate { + private final boolean update; + } +}