mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-01-27 13:27:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Listless no longer"

Browse source 
This reverts commit 22383fd5
This commit is contained in:
Jozufozu 2024-07-05 13:47:21 -07:00
parent 06a2788f9c
commit b2483def1d
11 changed files with 68 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/api/java/dev/engine_room/flywheel/api/visual/Effect.java
View file

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

4
common/src/api/java/dev/engine_room/flywheel/api/visualization/BlockEntityVisualizer.java
View file

@ -1,7 +1,5 @@
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;
@ -18,7 +16,7 @@ public interface BlockEntityVisualizer<T extends BlockEntity> {
* @param blockEntity The block entity to construct a visual for.
* @return The visual.
*/
List<BlockEntityVisual<? super T>> createVisual(VisualizationContext ctx, T blockEntity, float partialTick);
BlockEntityVisual<? super T> createVisual(VisualizationContext ctx, T blockEntity, float partialTick);
/**
* Checks if the given block entity should not be rendered with the vanilla {@link BlockEntityRenderer}.

4
common/src/api/java/dev/engine_room/flywheel/api/visualization/EntityVisualizer.java
View file

@ -1,7 +1,5 @@
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;
@ -18,7 +16,7 @@ public interface EntityVisualizer<T extends Entity> {
* @param entity The entity to construct a visual for.
* @return The visual.
*/
List<EntityVisual<? super T>> createVisual(VisualizationContext ctx, T entity, float partialTick);
EntityVisual<? super T> createVisual(VisualizationContext ctx, T entity, float partialTick);
/**
* Checks if the given entity should not render with the vanilla {@link EntityRenderer}.

5
common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleBlockEntityVisualizer.java
View file

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

5
common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisualizer.java
View file

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

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

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

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

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

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

@ -1,6 +1,5 @@
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;
@ -14,7 +13,7 @@ public class EffectStorage extends Storage<Effect> {
}
@Override
protected List<? extends EffectVisual<?>> createRaw(Effect obj, float partialTick) {
protected EffectVisual<?> createRaw(Effect obj, float partialTick) {
return obj.visualize(visualizationContextSupplier.get(), partialTick);
}

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

@ -1,6 +1,5 @@
package dev.engine_room.flywheel.impl.visualization.manager;
import java.util.List;
import java.util.function.Supplier;
import dev.engine_room.flywheel.api.visual.EntityVisual;
@ -16,10 +15,10 @@ public class EntityStorage extends Storage<Entity> {
}
@Override
protected List<? extends EntityVisual<?>> createRaw(Entity obj, float partialTick) {
protected EntityVisual<?> createRaw(Entity obj, float partialTick) {
var visualizer = VisualizationHelper.getVisualizer(obj);
if (visualizer == null) {
return List.of();
return null;
}
return visualizer.createVisual(visualizationContextSupplier.get(), obj, partialTick);

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

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

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

@ -1,10 +1,13 @@
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;
@ -26,51 +29,60 @@ public abstract class Storage<T> {
protected final List<SimpleTickableVisual> simpleTickableVisuals = new ArrayList<>();
protected final LitVisualStorage litVisuals = new LitVisualStorage();
private final Map<T, List<? extends Visual>> visuals = new Reference2ObjectOpenHashMap<>();
private final Map<T, Visual> visuals = new Reference2ObjectOpenHashMap<>();
public Storage(Supplier<VisualizationContext> visualizationContextSupplier) {
this.visualizationContextSupplier = visualizationContextSupplier;
}
public int visualCount() {
int out = 0;
for (var visualList : visuals.values()) {
out += visualList.size();
}
return out;
public Collection<Visual> getAllVisuals() {
return visuals.values();
}
public void add(T obj, float partialTick) {
var visualList = this.visuals.get(obj);
Visual visual = visuals.get(obj);
if (visualList == null) {
if (visual == null) {
create(obj, partialTick);
}
}
public void remove(T obj) {
var visualList = this.visuals.remove(obj);
Visual visual = visuals.remove(obj);
if (visualList == null || visualList.isEmpty()) {
if (visual == null) {
return;
}
for (Visual visual : visualList) {
remove(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();
}
public void update(T obj, float partialTick) {
var visualList = visuals.get(obj);
Visual visual = visuals.get(obj);
if (visualList == null || visualList.isEmpty()) {
if (visual == null) {
return;
}
for (Visual visual : visualList) {
visual.update(partialTick);
}
}
public void recreateAll(float partialTick) {
tickableVisuals.clear();
@ -78,17 +90,13 @@ public abstract class Storage<T> {
simpleTickableVisuals.clear();
simpleDynamicVisuals.clear();
litVisuals.clear();
visuals.replaceAll((obj, visuals) -> {
visuals.forEach(Visual::delete);
visuals.replaceAll((obj, visual) -> {
visual.delete();
var out = createRaw(obj, partialTick);
if (out.isEmpty()) {
return null;
}
for (Visual visual : out) {
setup(visual);
if (out != null) {
setup(out);
}
return out;
@ -99,28 +107,22 @@ public abstract class Storage<T> {
tickableVisuals.clear();
dynamicVisuals.clear();
litVisuals.clear();
for (var visualList : visuals.values()) {
for (Visual visual : visualList) {
visual.delete();
}
}
visuals.values()
.forEach(Visual::delete);
visuals.clear();
}
private void create(T obj, float partialTick) {
var visuals = createRaw(obj, partialTick);
var visual = createRaw(obj, partialTick);
if (visuals.isEmpty()) {
return;
}
this.visuals.put(obj, visuals);
for (Visual visual : visuals) {
if (visual != null) {
setup(visual);
visuals.put(obj, visual);
}
}
protected abstract List<? extends Visual> createRaw(T obj, float partialTick);
@Nullable
protected abstract Visual createRaw(T obj, float partialTick);
public Plan<DynamicVisual.Context> framePlan() {
return NestedPlan.of(dynamicVisuals, litVisuals.plan(), ForEachPlan.of(() -> simpleDynamicVisuals, SimpleDynamicVisual::beginFrame));
@ -156,27 +158,6 @@ 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?
*