Lit on init

- Automatically call updateLight upon visual creation
Engine-Room · Jul 19, 2024 · cc0ad90 · cc0ad90
1 parent fe0eaca
commit cc0ad90
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/LightUpdatedVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/LightUpdatedVisual.java
@@ -9,8 +9,7 @@
  */
 public non-sealed interface LightUpdatedVisual extends SectionTrackedVisual {
 	/**
-	 * Called when a section this visual is contained in receives a light update. It is not called
-	 * unconditionally after visual creation or {@link SectionCollector#sections}.
+	 * Called after visual construction and when a section this visual is contained in receives a light update.
 	 *
 	 * <p>Even if multiple sections are updated at the same time, this method will only be called once.</p>
 	 *

diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java
@@ -128,7 +128,7 @@ public void recreateAll(float partialTick) {
 			var out = createRaw(obj, partialTick);
 
 			if (out != null) {
-				setup(out);
+				setup(out, partialTick);
 			}
 
 			return out;
@@ -139,15 +139,15 @@ private void create(T obj, float partialTick) {
 		var visual = createRaw(obj, partialTick);
 
 		if (visual != null) {
-			setup(visual);
+			setup(visual, partialTick);
 			visuals.put(obj, visual);
 		}
 	}
 
 	@Nullable
 	protected abstract Visual createRaw(T obj, float partialTick);
 
-	private void setup(Visual visual) {
+	private void setup(Visual visual, float partialTick) {
 		if (visual instanceof DynamicVisual dynamic) {
 			if (visual instanceof SimpleDynamicVisual simpleDynamic) {
 				simpleDynamicVisuals.add(simpleDynamic);
@@ -172,6 +172,7 @@ private void setup(Visual visual) {
 
 			if (visual instanceof LightUpdatedVisual lightUpdated) {
 				lightUpdatedVisuals.add(lightUpdated, tracker);
+				lightUpdated.updateLight(partialTick);
 			}
 
 			if (visual instanceof ShaderLightVisual shaderLight) {

diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/BellVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/BellVisual.java
@@ -38,7 +38,6 @@ public BellVisual(VisualizationContext ctx, BellBlockEntity blockEntity, float p
 		bell.setChanged();
 
 		updateRotation(partialTick);
-		updateLight(partialTick);
 	}
 
 	private OrientedInstance createBellInstance() {

diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/ChestVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/ChestVisual.java
@@ -88,7 +88,6 @@ public ChestVisual(VisualizationContext ctx, T blockEntity, float partialTick) {
 		bottom.setChanged();
 
 		applyLidTransform(lidProgress.get(partialTick));
-		updateLight(partialTick);
 	}
 
 	private OrientedInstance createBottomInstance(Material texture) {

diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/ShulkerBoxVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/ShulkerBoxVisual.java
@@ -67,8 +67,6 @@ public ShulkerBoxVisual(VisualizationContext ctx, ShulkerBoxBlockEntity blockEnt
 		base.setChanged();
 		lid = createLidInstance(texture).setTransform(stack);
 		lid.setChanged();
-
-		updateLight(partialTick);
 	}
 
 	private TransformedInstance createBaseInstance(Material texture) {