chunks;
public LightUpdater() {
- sections = new Long2ObjectOpenHashMap<>();
- listenersToSections = new WeakHashMap<>();
+ allListeners = new WeakHashSet<>();
+ sections = new WeakContainmentMultiMap<>();
+ chunks = new WeakContainmentMultiMap<>();
+ }
- chunks = new Long2ObjectOpenHashMap<>();
- listenersToChunks = new WeakHashMap<>();
+ public void tick() {
+ for (ILightUpdateListener listener : allListeners) {
+ if (listener.status() == ListenerStatus.UPDATE) {
+ addListener(listener);
+
+ listener.onLightUpdate(Minecraft.getInstance().level, LightType.BLOCK, null);
+ }
+ }
}
/**
- * Add a listener associated with the given {@link BlockPos}.
- *
- * When a light update occurs in the chunk the position is contained in,
- * {@link ILightUpdateListener#onLightUpdate} will be called.
- *
- * @param pos The position in the world that the listener cares about.
+ * Add a listener.
+
* @param listener The object that wants to receive light update notifications.
*/
- public void startListening(BlockPos pos, ILightUpdateListener listener) {
- LongRBTreeSet sections = clearSections(listener);
- LongRBTreeSet chunks = clearChunks(listener);
+ public void addListener(ILightUpdateListener listener) {
+ allListeners.add(listener);
- long sectionPos = worldToSection(pos);
- addToSection(sectionPos, listener);
- sections.add(sectionPos);
+ Volume volume = listener.getVolume();
- long chunkPos = sectionToChunk(sectionPos);
- addToChunk(chunkPos, listener);
- chunks.add(chunkPos);
- }
+ LongSet sections = this.sections.getAndResetContainment(listener);
+ LongSet chunks = this.chunks.getAndResetContainment(listener);
- /**
- * Add a listener associated with the given {@link GridAlignedBB}.
- *
- * When a light update occurs in any chunk spanning the given volume,
- * {@link ILightUpdateListener#onLightUpdate} will be called.
- *
- * @param volume The volume in the world that the listener cares about.
- * @param listener The object that wants to receive light update notifications.
- */
- public void startListening(GridAlignedBB volume, ILightUpdateListener listener) {
- LongRBTreeSet sections = clearSections(listener);
- LongRBTreeSet chunks = clearSections(listener);
+ if (volume instanceof Volume.Block) {
+ BlockPos pos = ((Volume.Block) volume).pos;
+ long sectionPos = blockToSection(pos);
+ this.sections.put(sectionPos, listener);
+ sections.add(sectionPos);
- int minX = SectionPos.blockToSectionCoord(volume.minX);
- int minY = SectionPos.blockToSectionCoord(volume.minY);
- int minZ = SectionPos.blockToSectionCoord(volume.minZ);
- int maxX = SectionPos.blockToSectionCoord(volume.maxX);
- int maxY = SectionPos.blockToSectionCoord(volume.maxY);
- int maxZ = SectionPos.blockToSectionCoord(volume.maxZ);
+ long chunkPos = sectionToChunk(sectionPos);
+ this.chunks.put(chunkPos, listener);
+ chunks.add(chunkPos);
+ } else if (volume instanceof Volume.Box) {
+ GridAlignedBB box = ((Volume.Box) volume).box;
- for (int x = minX; x <= maxX; x++) {
- for (int z = minZ; z <= maxZ; z++) {
- for (int y = minY; y <= maxY; y++) {
- long sectionPos = SectionPos.asLong(x, y, z);
- addToSection(sectionPos, listener);
- sections.add(sectionPos);
+ int minX = SectionPos.blockToSectionCoord(box.minX);
+ int minY = SectionPos.blockToSectionCoord(box.minY);
+ int minZ = SectionPos.blockToSectionCoord(box.minZ);
+ int maxX = SectionPos.blockToSectionCoord(box.maxX);
+ int maxY = SectionPos.blockToSectionCoord(box.maxY);
+ int maxZ = SectionPos.blockToSectionCoord(box.maxZ);
+
+ for (int x = minX; x <= maxX; x++) {
+ for (int z = minZ; z <= maxZ; z++) {
+ for (int y = minY; y <= maxY; y++) {
+ long sectionPos = SectionPos.asLong(x, y, z);
+ this.sections.put(sectionPos, listener);
+ sections.add(sectionPos);
+ }
+ long chunkPos = SectionPos.asLong(x, 0, z);
+ this.chunks.put(chunkPos, listener);
+ chunks.add(chunkPos);
}
- long chunkPos = SectionPos.asLong(x, 0, z);
- addToChunk(chunkPos, listener);
- chunks.add(chunkPos);
}
}
}
@@ -110,13 +96,17 @@ public class LightUpdater {
* @param sectionPos A long representing the section position where light changed.
*/
public void onLightUpdate(IBlockDisplayReader world, LightType type, long sectionPos) {
- WeakHashSet set = sections.get(sectionPos);
+ Set set = sections.get(sectionPos);
if (set == null || set.isEmpty()) return;
+ set.removeIf(l -> l.status().shouldRemove());
+
GridAlignedBB chunkBox = GridAlignedBB.from(SectionPos.of(sectionPos));
- set.removeIf(listener -> listener.onLightUpdate(world, type, chunkBox.copy()));
+ for (ILightUpdateListener listener : set) {
+ listener.onLightUpdate(world, type, chunkBox.copy());
+ }
}
/**
@@ -126,63 +116,20 @@ public class LightUpdater {
* @param world The world in which light was updated.
*/
public void onLightPacket(IBlockDisplayReader world, int chunkX, int chunkZ) {
-
long chunkPos = SectionPos.asLong(chunkX, 0, chunkZ);
- WeakHashSet set = chunks.get(chunkPos);
+ Set set = chunks.get(chunkPos);
if (set == null || set.isEmpty()) return;
- set.removeIf(listener -> listener.onLightPacket(world, chunkX, chunkZ));
- }
+ set.removeIf(l -> l.status().shouldRemove());
- private LongRBTreeSet clearChunks(ILightUpdateListener listener) {
- return clear(listener, listenersToChunks, chunks);
- }
-
- private LongRBTreeSet clearSections(ILightUpdateListener listener) {
- return clear(listener, listenersToSections, sections);
- }
-
- private LongRBTreeSet clear(ILightUpdateListener listener, WeakHashMap listeners, Long2ObjectMap> lookup) {
- LongRBTreeSet set = listeners.get(listener);
-
- if (set == null) {
- set = new LongRBTreeSet();
- listeners.put(listener, set);
- } else {
- set.forEach((LongConsumer) l -> {
- WeakHashSet listeningSections = lookup.get(l);
-
- if (listeningSections != null) listeningSections.remove(listener);
- });
-
- set.clear();
+ for (ILightUpdateListener listener : set) {
+ listener.onLightPacket(world, chunkX, chunkZ);
}
-
- return set;
}
- private void addToSection(long sectionPos, ILightUpdateListener listener) {
- getOrCreate(sections, sectionPos).add(listener);
- }
-
- private void addToChunk(long chunkPos, ILightUpdateListener listener) {
- getOrCreate(chunks, chunkPos).add(listener);
- }
-
- private WeakHashSet getOrCreate(Long2ObjectMap> sections, long chunkPos) {
- WeakHashSet set = sections.get(chunkPos);
-
- if (set == null) {
- set = new WeakHashSet<>();
- sections.put(chunkPos, set);
- }
-
- return set;
- }
-
- public static long worldToSection(BlockPos pos) {
+ public static long blockToSection(BlockPos pos) {
return SectionPos.asLong(pos.getX(), pos.getY(), pos.getZ());
}
diff --git a/src/main/java/com/jozufozu/flywheel/light/ListenerStatus.java b/src/main/java/com/jozufozu/flywheel/light/ListenerStatus.java
new file mode 100644
index 000000000..e8ca36d30
--- /dev/null
+++ b/src/main/java/com/jozufozu/flywheel/light/ListenerStatus.java
@@ -0,0 +1,16 @@
+package com.jozufozu.flywheel.light;
+
+public enum ListenerStatus {
+ OKAY,
+ REMOVE,
+ UPDATE,
+ ;
+
+ public boolean isOk() {
+ return this == OKAY;
+ }
+
+ public boolean shouldRemove() {
+ return this == REMOVE;
+ }
+}
diff --git a/src/main/java/com/jozufozu/flywheel/light/Volume.java b/src/main/java/com/jozufozu/flywheel/light/Volume.java
new file mode 100644
index 000000000..b812bba71
--- /dev/null
+++ b/src/main/java/com/jozufozu/flywheel/light/Volume.java
@@ -0,0 +1,35 @@
+package com.jozufozu.flywheel.light;
+
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+
+public class Volume {
+
+ public static Volume.Block block(BlockPos pos) {
+ return new Block(pos);
+ }
+
+ public static Volume.Box box(GridAlignedBB box) {
+ return new Box(box);
+ }
+
+ public static Volume.Box box(AxisAlignedBB box) {
+ return new Box(GridAlignedBB.from(box));
+ }
+
+ public static class Block extends Volume {
+ public final BlockPos pos;
+
+ public Block(BlockPos pos) {
+ this.pos = pos;
+ }
+ }
+
+ public static class Box extends Volume {
+ public final GridAlignedBB box;
+
+ public Box(GridAlignedBB box) {
+ this.box = box;
+ }
+ }
+}
diff --git a/src/main/java/com/jozufozu/flywheel/light/WeakContainmentMultiMap.java b/src/main/java/com/jozufozu/flywheel/light/WeakContainmentMultiMap.java
new file mode 100644
index 000000000..944e75a75
--- /dev/null
+++ b/src/main/java/com/jozufozu/flywheel/light/WeakContainmentMultiMap.java
@@ -0,0 +1,56 @@
+package com.jozufozu.flywheel.light;
+
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.function.LongConsumer;
+
+import com.jozufozu.flywheel.util.WeakHashSet;
+
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.longs.LongRBTreeSet;
+import it.unimi.dsi.fastutil.longs.LongSet;
+
+public class WeakContainmentMultiMap {
+
+ private final Long2ObjectMap> forward;
+ private final WeakHashMap reverse;
+
+ public WeakContainmentMultiMap() {
+ forward = new Long2ObjectOpenHashMap<>();
+ reverse = new WeakHashMap<>();
+ }
+
+ /**
+ * This is a confusing function, but it maintains the internal state of the chunk/section maps.
+ *
+ *
+ * First, uses the reverse lookup map to remove listener from all sets in the lookup map.
+ * Then, clears the listeners containment set.
+ *
+ *
+ * @param listener The listener to clean up.
+ * @return An empty set that should be populated with the chunks/sections the listener is contained in.
+ */
+ public LongSet getAndResetContainment(T listener) {
+ LongSet containmentSet = reverse.computeIfAbsent(listener, $ -> new LongRBTreeSet());
+
+ containmentSet.forEach((LongConsumer) l -> {
+ WeakHashSet listeners = forward.get(l);
+
+ if (listeners != null) listeners.remove(listener);
+ });
+
+ containmentSet.clear();
+
+ return containmentSet;
+ }
+
+ public Set get(long l) {
+ return forward.get(l);
+ }
+
+ public void put(long sectionPos, T listener) {
+ forward.computeIfAbsent(sectionPos, $ -> new WeakHashSet<>()).add(listener);
+ }
+}
diff --git a/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java
index 0c40a62ab..6a6ab7f73 100644
--- a/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java
+++ b/src/main/java/com/jozufozu/flywheel/mixin/light/LightUpdateMixin.java
@@ -38,25 +38,6 @@ public abstract class LightUpdateMixin extends AbstractChunkProvider {
ClientChunkProvider thi = ((ClientChunkProvider) (Object) this);
ClientWorld world = (ClientWorld) thi.getLevel();
- Chunk chunk = thi.getChunk(pos.x(), pos.z(), false);
-
- int sectionY = pos.y();
-
- if (ChunkUtil.isValidSection(chunk, sectionY)) {
- InstanceManager tiles = InstancedRenderDispatcher.getTiles(world);
- InstanceManager entities = InstancedRenderDispatcher.getEntities(world);
-
- chunk.getBlockEntities()
- .entrySet()
- .stream()
- .filter(entry -> SectionPos.blockToSectionCoord(entry.getKey()
- .getY()) == sectionY)
- .map(Map.Entry::getValue)
- .forEach(tiles::onLightUpdate);
-
- chunk.getEntitySections()[sectionY].forEach(entities::onLightUpdate);
- }
-
LightUpdater.getInstance()
.onLightUpdate(world, type, pos.asLong());
}
diff --git a/src/main/java/com/jozufozu/flywheel/mixin/light/NetworkLightUpdateMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/light/NetworkLightUpdateMixin.java
index cc9596070..ed396c31d 100644
--- a/src/main/java/com/jozufozu/flywheel/mixin/light/NetworkLightUpdateMixin.java
+++ b/src/main/java/com/jozufozu/flywheel/mixin/light/NetworkLightUpdateMixin.java
@@ -34,22 +34,6 @@ public class NetworkLightUpdateMixin {
int chunkX = packet.getX();
int chunkZ = packet.getZ();
- Chunk chunk = world.getChunkSource()
- .getChunk(chunkX, chunkZ, false);
-
- if (chunk != null) {
- InstanceManager tiles = InstancedRenderDispatcher.getTiles(world);
- InstanceManager entities = InstancedRenderDispatcher.getEntities(world);
-
- chunk.getBlockEntities()
- .values()
- .forEach(tiles::onLightUpdate);
-
- Arrays.stream(chunk.getEntitySections())
- .flatMap(ClassInheritanceMultiMap::stream)
- .forEach(entities::onLightUpdate);
- }
-
LightUpdater.getInstance()
.onLightPacket(world, chunkX, chunkZ);
});
diff --git a/src/main/java/com/jozufozu/flywheel/util/WeakHashSet.java b/src/main/java/com/jozufozu/flywheel/util/WeakHashSet.java
index b3683526a..281aaf418 100644
--- a/src/main/java/com/jozufozu/flywheel/util/WeakHashSet.java
+++ b/src/main/java/com/jozufozu/flywheel/util/WeakHashSet.java
@@ -98,7 +98,11 @@ public class WeakHashSet extends AbstractSet {
@Override
public boolean addAll(Collection c) {
- return false;
+ boolean out = false;
+ for (T t : c) {
+ out |= add(t);
+ }
+ return out;
}
@Override
diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java
index 28d922fcd..3568b4b09 100644
--- a/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java
+++ b/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java
@@ -1,13 +1,12 @@
package com.jozufozu.flywheel.vanilla;
import com.jozufozu.flywheel.backend.instancing.IDynamicInstance;
+import com.jozufozu.flywheel.backend.instancing.ITickableInstance;
import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance;
import com.jozufozu.flywheel.backend.material.MaterialManager;
-import com.jozufozu.flywheel.backend.model.ModelPool;
import com.jozufozu.flywheel.backend.state.TextureRenderState;
import com.jozufozu.flywheel.core.Materials;
import com.jozufozu.flywheel.core.materials.ModelData;
-import com.jozufozu.flywheel.core.model.BlockModel;
import com.jozufozu.flywheel.core.model.IModel;
import com.jozufozu.flywheel.core.model.ModelPart;
import com.jozufozu.flywheel.util.AnimationTickHolder;
@@ -21,22 +20,36 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.vector.Vector3f;
-public class MinecartInstance extends EntityInstance implements IDynamicInstance {
+public class MinecartInstance extends EntityInstance implements IDynamicInstance, ITickableInstance {
private static final ResourceLocation MINECART_LOCATION = new ResourceLocation("textures/entity/minecart.png");
MatrixTransformStack stack = new MatrixTransformStack();
private final ModelData body;
- private final ModelData contents;
+ private ModelData contents;
+ private BlockState blockstate;
public MinecartInstance(MaterialManager materialManager, T entity) {
super(materialManager, entity);
+ blockstate = entity.getDisplayBlockState();
contents = getContents();
body = getBody();
}
+ @Override
+ public void tick() {
+ BlockState displayBlockState = entity.getDisplayBlockState();
+
+ if (displayBlockState != blockstate) {
+ blockstate = displayBlockState;
+ contents.delete();
+ contents = getContents();
+ updateLight();
+ }
+ }
+
@Override
public void beginFrame() {
stack.setIdentity();
@@ -124,8 +137,6 @@ public class MinecartInstance extends EntityIn
}
private ModelData getContents() {
- BlockState blockstate = entity.getDisplayBlockState();
-
if (blockstate.getRenderShape() == BlockRenderType.INVISIBLE)
return null;