Listless no longer

- Visualizers return a list of visuals instead of just one
- Simple*Visualizer's builders still only allow one visual per object,
  I'm not sure how best to expose adding multiple in a way that allows
  other mods to extend existing visualizers

common/src/api/java/dev/engine_room/flywheel/api/visual/Effect.java

@@ -1,5 +1,7 @@
 package dev.engine_room.flywheel.api.visual;
 
+import java.util.List;
+
 import dev.engine_room.flywheel.api.visualization.VisualizationContext;
 
 /**
@@ -14,5 +16,5 @@ public interface Effect {
 	 * @param ctx The visualization context.
 	 * @return An arbitrary EffectVisual.
 	 */
-	EffectVisual<?> visualize(VisualizationContext ctx);
+	List<EffectVisual<?>> visualize(VisualizationContext ctx);
 }

common/src/api/java/dev/engine_room/flywheel/api/visualization/BlockEntityVisualizer.java

@@ -1,5 +1,7 @@
 package dev.engine_room.flywheel.api.visualization;
 
+import java.util.List;
+
 import dev.engine_room.flywheel.api.visual.BlockEntityVisual;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -16,7 +18,7 @@ public interface BlockEntityVisualizer<T extends BlockEntity> {
 	 * @param blockEntity The block entity to construct a visual for.
 	 * @return The visual.
 	 */
-	BlockEntityVisual<? super T> createVisual(VisualizationContext ctx, T blockEntity);
+	List<BlockEntityVisual<? super T>> createVisual(VisualizationContext ctx, T blockEntity);
 
 	/**
 	 * Checks if the given block entity should not be rendered with the vanilla {@link BlockEntityRenderer}.

common/src/api/java/dev/engine_room/flywheel/api/visualization/EntityVisualizer.java

@@ -1,5 +1,7 @@
 package dev.engine_room.flywheel.api.visualization;
 
+import java.util.List;
+
 import dev.engine_room.flywheel.api.visual.EntityVisual;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.world.entity.Entity;
@@ -16,7 +18,7 @@ public interface EntityVisualizer<T extends Entity> {
 	 * @param entity The entity to construct a visual for.
 	 * @return The visual.
 	 */
-	EntityVisual<? super T> createVisual(VisualizationContext ctx, T entity);
+	List<EntityVisual<? super T>> createVisual(VisualizationContext ctx, T entity);
 
 	/**
 	 * Checks if the given entity should not render with the vanilla {@link EntityRenderer}.

common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleBlockEntityVisualizer.java

@@ -1,5 +1,6 @@
 package dev.engine_room.flywheel.lib.visual;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
 
@@ -23,8 +24,8 @@ public class SimpleBlockEntityVisualizer<T extends BlockEntity> implements Block
 	}
 
 	@Override
-	public BlockEntityVisual<? super T> createVisual(VisualizationContext ctx, T blockEntity) {
+	public List<BlockEntityVisual<? super T>> createVisual(VisualizationContext ctx, T blockEntity) {
-		return visualFactory.create(ctx, blockEntity);
+		return List.of(visualFactory.create(ctx, blockEntity));
 	}
 
 	@Override

common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisualizer.java

@@ -1,5 +1,6 @@
 package dev.engine_room.flywheel.lib.visual;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
 
@@ -23,8 +24,8 @@ public class SimpleEntityVisualizer<T extends Entity> implements EntityVisualize
 	}
 
 	@Override
-	public EntityVisual<? super T> createVisual(VisualizationContext ctx, T entity) {
+	public List<EntityVisual<? super T>> createVisual(VisualizationContext ctx, T entity) {
-		return visualFactory.create(ctx, entity);
+		return List.of(visualFactory.create(ctx, entity));
 	}
 
 	@Override

common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationManagerImpl.java

@@ -17,6 +17,7 @@ import dev.engine_room.flywheel.api.event.RenderStage;
 import dev.engine_room.flywheel.api.instance.Instance;
 import dev.engine_room.flywheel.api.task.Plan;
 import dev.engine_room.flywheel.api.task.TaskExecutor;
+import dev.engine_room.flywheel.api.visual.BlockEntityVisual;
 import dev.engine_room.flywheel.api.visual.DynamicVisual;
 import dev.engine_room.flywheel.api.visual.Effect;
 import dev.engine_room.flywheel.api.visual.TickableVisual;
@@ -261,21 +262,23 @@ public class VisualizationManagerImpl implements VisualizationManager {
 				continue;
 			}
 
-			var visual = blockEntities.getStorage()
+			var visualList = blockEntities.getStorage()
 					.visualAtPos(entry.getLongKey());
 
-			if (visual == null) {
+			if (visualList == null || visualList.isEmpty()) {
 				// The block doesn't have a visual, this is probably the common case.
 				continue;
 			}
 
 			List<Instance> instances = new ArrayList<>();
 
-			visual.collectCrumblingInstances(instance -> {
+			for (BlockEntityVisual<?> visual : visualList) {
-				if (instance != null) {
+				visual.collectCrumblingInstances(instance -> {
-					instances.add(instance);
+					if (instance != null) {
-				}
+						instances.add(instance);
-			});
+					}
+				});
+			}
 
 			if (instances.isEmpty()) {
 				// The visual doesn't want to render anything crumbling.

common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/BlockEntityStorage.java

@@ -1,11 +1,11 @@
 package dev.engine_room.flywheel.impl.visualization.manager;
 
+import java.util.List;
 import java.util.function.Supplier;
 
 import org.jetbrains.annotations.Nullable;
 
 import dev.engine_room.flywheel.api.visual.BlockEntityVisual;
-import dev.engine_room.flywheel.api.visual.Visual;
 import dev.engine_room.flywheel.api.visualization.VisualizationContext;
 import dev.engine_room.flywheel.impl.visualization.storage.Storage;
 import dev.engine_room.flywheel.lib.visual.VisualizationHelper;
@@ -17,14 +17,14 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 
 public class BlockEntityStorage extends Storage<BlockEntity> {
-	private final Long2ObjectMap<BlockEntityVisual<?>> posLookup = new Long2ObjectOpenHashMap<>();
+	private final Long2ObjectMap<List<? extends BlockEntityVisual<?>>> posLookup = new Long2ObjectOpenHashMap<>();
 
 	public BlockEntityStorage(Supplier<VisualizationContext> visualizationContextSupplier) {
 		super(visualizationContextSupplier);
 	}
 
 	@Nullable
-	public BlockEntityVisual<?> visualAtPos(long pos) {
+	public List<? extends BlockEntityVisual<?>> visualAtPos(long pos) {
 		return posLookup.get(pos);
 	}
 
@@ -53,19 +53,18 @@ public class BlockEntityStorage extends Storage<BlockEntity> {
 	}
 
 	@Override
-	@Nullable
+	protected List<? extends BlockEntityVisual<?>> createRaw(BlockEntity obj) {
-	protected Visual createRaw(BlockEntity obj) {
 		var visualizer = VisualizationHelper.getVisualizer(obj);
 		if (visualizer == null) {
-			return null;
+			return List.of();
 		}
 
-		var visual = visualizer.createVisual(visualizationContextSupplier.get(), obj);
+		var visualList = visualizer.createVisual(visualizationContextSupplier.get(), obj);
 
 		BlockPos blockPos = obj.getBlockPos();
-		posLookup.put(blockPos.asLong(), visual);
+		posLookup.put(blockPos.asLong(), visualList);
 
-		return visual;
+		return visualList;
 	}
 
 	@Override

common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EffectStorage.java

@@ -1,5 +1,6 @@
 package dev.engine_room.flywheel.impl.visualization.manager;
 
+import java.util.List;
 import java.util.function.Supplier;
 
 import dev.engine_room.flywheel.api.visual.Effect;
@@ -13,7 +14,7 @@ public class EffectStorage extends Storage<Effect> {
 	}
 
 	@Override
-	protected EffectVisual<?> createRaw(Effect obj) {
+	protected List<? extends EffectVisual<?>> createRaw(Effect obj) {
 		return obj.visualize(visualizationContextSupplier.get());
 	}
 

common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EntityStorage.java

@@ -1,10 +1,9 @@
 package dev.engine_room.flywheel.impl.visualization.manager;
 
+import java.util.List;
 import java.util.function.Supplier;
 
-import org.jetbrains.annotations.Nullable;
+import dev.engine_room.flywheel.api.visual.EntityVisual;
-
-import dev.engine_room.flywheel.api.visual.Visual;
 import dev.engine_room.flywheel.api.visualization.VisualizationContext;
 import dev.engine_room.flywheel.impl.visualization.storage.Storage;
 import dev.engine_room.flywheel.lib.visual.VisualizationHelper;
@@ -17,11 +16,10 @@ public class EntityStorage extends Storage<Entity> {
 	}
 
 	@Override
-	@Nullable
+    protected List<? extends EntityVisual<?>> createRaw(Entity obj) {
-	protected Visual createRaw(Entity obj) {
 		var visualizer = VisualizationHelper.getVisualizer(obj);
 		if (visualizer == null) {
-			return null;
+			return List.of();
 		}
 
 		return visualizer.createVisual(visualizationContextSupplier.get(), obj);

common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/VisualManagerImpl.java

@@ -26,7 +26,7 @@ public class VisualManagerImpl<T, S extends Storage<T>> implements VisualManager
 
 	@Override
 	public int getVisualCount() {
-		return getStorage().getAllVisuals().size();
+		return getStorage().visualCount();
 	}
 
 	@Override

common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java

@@ -1,13 +1,10 @@
 package dev.engine_room.flywheel.impl.visualization.storage;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
 
-import org.jetbrains.annotations.Nullable;
-
 import dev.engine_room.flywheel.api.task.Plan;
 import dev.engine_room.flywheel.api.visual.DynamicVisual;
 import dev.engine_room.flywheel.api.visual.LitVisual;
@@ -29,59 +26,50 @@ public abstract class Storage<T> {
 	protected final List<SimpleTickableVisual> simpleTickableVisuals = new ArrayList<>();
 	protected final LitVisualStorage litVisuals = new LitVisualStorage();
 
-	private final Map<T, Visual> visuals = new Reference2ObjectOpenHashMap<>();
+	private final Map<T, List<? extends Visual>> visuals = new Reference2ObjectOpenHashMap<>();
 
 	public Storage(Supplier<VisualizationContext> visualizationContextSupplier) {
 		this.visualizationContextSupplier = visualizationContextSupplier;
 	}
 
-	public Collection<Visual> getAllVisuals() {
+	public int visualCount() {
-		return visuals.values();
+		int out = 0;
+		for (var visualList : visuals.values()) {
+			out += visualList.size();
+		}
+		return out;
 	}
 
 	public void add(T obj, float partialTick) {
-		Visual visual = visuals.get(obj);
+		var visualList = this.visuals.get(obj);
 
-		if (visual == null) {
+		if (visualList == null) {
 			create(obj, partialTick);
 		}
 	}
 
 	public void remove(T obj) {
-		Visual visual = visuals.remove(obj);
+		var visualList = this.visuals.remove(obj);
 
-		if (visual == null) {
+		if (visualList == null || visualList.isEmpty()) {
 			return;
 		}
 
-		if (visual instanceof TickableVisual tickable) {
+		for (Visual visual : visualList) {
-			if (visual instanceof SimpleTickableVisual simpleTickable) {
+			remove(visual);
-				simpleTickableVisuals.remove(simpleTickable);
-			} else {
-				tickableVisuals.remove(tickable);
-			}
 		}
-		if (visual instanceof DynamicVisual dynamic) {
-			if (visual instanceof SimpleDynamicVisual simpleDynamic) {
-				simpleDynamicVisuals.remove(simpleDynamic);
-			} else {
-				dynamicVisuals.remove(dynamic);
-			}
-		}
-		if (visual instanceof LitVisual lit) {
-			litVisuals.remove(lit);
-		}
-		visual.delete();
 	}
 
 	public void update(T obj, float partialTick) {
-		Visual visual = visuals.get(obj);
+		var visualList = visuals.get(obj);
 
-		if (visual == null) {
+		if (visualList == null || visualList.isEmpty()) {
 			return;
 		}
 
-		visual.update(partialTick);
+		for (Visual visual : visualList) {
+			visual.update(partialTick);
+		}
 	}
 
 	public void recreateAll(float partialTick) {
@@ -90,13 +78,17 @@ public abstract class Storage<T> {
 		simpleTickableVisuals.clear();
 		simpleDynamicVisuals.clear();
 		litVisuals.clear();
-		visuals.replaceAll((obj, visual) -> {
+		visuals.replaceAll((obj, visuals) -> {
-			visual.delete();
+			visuals.forEach(Visual::delete);
 
-			Visual out = createRaw(obj);
+			var out = createRaw(obj);
 
-			if (out != null) {
+			if (out.isEmpty()) {
-				setup(out, partialTick);
+				return null;
+			}
+
+			for (Visual visual : out) {
+				setup(visual, partialTick);
 			}
 
 			return out;
@@ -107,22 +99,28 @@ public abstract class Storage<T> {
 		tickableVisuals.clear();
 		dynamicVisuals.clear();
 		litVisuals.clear();
-		visuals.values()
+		for (var visualList : visuals.values()) {
-				.forEach(Visual::delete);
+			for (Visual visual : visualList) {
+				visual.delete();
+			}
+		}
 		visuals.clear();
 	}
 
 	private void create(T obj, float partialTick) {
-		Visual visual = createRaw(obj);
+		var visuals = createRaw(obj);
 
-		if (visual != null) {
+		if (visuals.isEmpty()) {
+			return;
+		}
+		this.visuals.put(obj, visuals);
+
+		for (Visual visual : visuals) {
 			setup(visual, partialTick);
-			visuals.put(obj, visual);
 		}
 	}
 
-	@Nullable
+	protected abstract List<? extends Visual> createRaw(T obj);
-	protected abstract Visual createRaw(T obj);
 
 	public Plan<DynamicVisual.Context> framePlan() {
 		return NestedPlan.of(dynamicVisuals, litVisuals.plan(), ForEachPlan.of(() -> simpleDynamicVisuals, SimpleDynamicVisual::beginFrame));
@@ -160,6 +158,27 @@ public abstract class Storage<T> {
 		}
 	}
 
+	private void remove(Visual visual) {
+		if (visual instanceof TickableVisual tickable) {
+			if (visual instanceof SimpleTickableVisual simpleTickable) {
+				simpleTickableVisuals.remove(simpleTickable);
+			} else {
+				tickableVisuals.remove(tickable);
+			}
+		}
+		if (visual instanceof DynamicVisual dynamic) {
+			if (visual instanceof SimpleDynamicVisual simpleDynamic) {
+				simpleDynamicVisuals.remove(simpleDynamic);
+			} else {
+				dynamicVisuals.remove(dynamic);
+			}
+		}
+		if (visual instanceof LitVisual lit) {
+			litVisuals.remove(lit);
+		}
+		visual.delete();
+	}
+
 	/**
 	 * Is the given object currently capable of being added?
 	 *