10 Commits

Author SHA1 Message Date
tkrmagid
5722c299d3 v0.4.25: add volume argument to /videoPlace, -1 mutes
Some checks failed
build / build (push) Has been cancelled
New signature:
  /videoPlace <pos> <facing> <width> <height> <volume> <url>

volume is int -1..100. 0..100 sets percent and clears mute; -1 is a CLI
shortcut that sets muted=true (underlying volume kept at 0.5 so a later
/videoMute false restores audible level without re-typing). Matches the
percent scale shown in the config GUI.
2026-05-17 03:31:13 +09:00
tkrmagid
ecd254cb78 v0.4.24: sync anchor config in vanilla BE update packet
Some checks failed
build / build (push) Has been cancelled
Bug: /videoPlace (and any path that places an anchor) reported success
on the server but the panel was invisible on the client — no quad, no
video. Walking around did not help.

Root cause: VideoAnchorBlockEntity did not override getUpdateTag() or
getUpdatePacket(). The base implementations return an empty CompoundTag
and null respectively, so url/facing/width/height were never carried in
vanilla BE sync. There is also a packet-ordering race between
level.setBlock() (queues a deferred chunk broadcast) and
ServerPlayNetworking.send(SyncAnchorPayload) (writes immediately): if
the payload arrives first, the client drops it because the BE does not
exist yet, then the chunk packet creates the BE with defaults
(url="") and the renderer silently no-ops.

Fix: override getUpdateTag(HolderLookup.Provider) → toNbt(), and
getUpdatePacket() → ClientboundBlockEntityDataPacket.create(this). NBT
key names already line up between toNbt() and loadAdditional(), so
vanilla wraps the CompoundTag in TagValueInput and existing load logic
reads it. Also fixes the 'walk far away, come back' case — that path
has no SyncAnchorPayload, just vanilla chunk re-sync.
2026-05-17 03:21:25 +09:00
tkrmagid
d559c0c56a v0.4.23: fix wall z-fight and texture discard at distance
Some checks failed
build / build (push) Has been cancelled
Reported: with render_distance_blocks=256, the panel started shimmering
and the wall texture bled through at ~30 blocks away. Both issues are
inherent distance-rendering bugs that were previously hidden by the
default ~64-block view distance.

Two fixes in VideoAnchorRenderer:
1. SURFACE_EPSILON 0.001 → 0.02. With 24-bit depth and near=0.05, the
   smallest resolvable depth step at 30 blocks is ~1mm, so the old 1mm
   offset was right at the z-fight boundary. 2cm gives ~20× margin at
   30 blocks and remains visually unnoticeable up close.
2. RenderType entityCutout → entitySolid. swscale outputs RGBA with
   alpha=255, so there is no real cutout. Cutout's alpha-discard step
   makes distant sampling unstable on a dynamic non-mipmapped texture;
   solid removes that and is the semantically correct type.
2026-05-17 00:04:48 +09:00
tkrmagid
05aace294e v0.4.22: route video audio through Players sound category
Some checks failed
build / build (push) Has been cancelled
Previously the per-anchor audio gain was just volume × distance attenuation,
which ignored Minecraft's sound options sliders entirely — Master and Players
both had no effect on video audio. Now updateDistanceGains multiplies in
options.getSoundSourceVolume(MASTER) × getSoundSourceVolume(PLAYERS) to
match vanilla SoundEngine.calculateVolume, so the Players slider attenuates
video audio like other player sounds and Master gates everything.

Recomputed at the same 20Hz tick as distance gain — slider drags take
effect within ~50ms with no extra plumbing.
2026-05-16 23:46:07 +09:00
tkrmagid
41c7c48825 v0.4.21: extract publishIfNotCancelled, close main download publish race
Some checks failed
build / build (push) Has been cancelled
Reviewer-flagged: v0.4.20 fixed the reindex branch's post-put race, but
the main download completion path still did READY.put without a follow-up
epoch check. /videoCache clear landing between READY.put and the chat
notification could leave a resurrected READY entry pointing at a deleted
file, plus a stale "완료" message.

Extracted publishIfNotCancelled(url, path, startEpoch) helper that does
the full pre-check → put → post-check → rollback dance, and routed both
publish sites (reindex branch + download-complete branch) through it.
Centralizing this is the structural fix: future publish sites can't forget
the post-check.
2026-05-16 22:57:52 +09:00
tkrmagid
1913181d02 v0.4.20: close reindex publish race + harden preload guard
Some checks failed
build / build (push) Has been cancelled
Reviewer-flagged: the existing-cache reindex branch in VideoCache.download
only ran one epoch check before READY.put, so a /videoCache clear landing
between the check and the put could leave a stale entry pointing at a
now-deleted file. Same pattern as the post-move fix in v0.4.19, applied
to the reindex path: pre-check, put, post-check + rollback on mismatch.

Also: preload() previously gated on READY.containsKey(url), which silently
blocks a re-preload if READY holds a stale key whose backing file is gone
(e.g. user deleted the file manually, or the cleanup half of a clear race).
Switched to lookup(url) — same intent, but lookup verifies the file
actually exists on disk, so stale keys self-heal on the next preload.
2026-05-16 22:54:20 +09:00
tkrmagid
d11289309b v0.4.19: fix post-move publish race in VideoCache.download
Some checks failed
build / build (push) Has been cancelled
Reviewer-flagged: v0.4.18 only checked epoch BEFORE Files.move. The window
between the move completing and READY.put / "완료" chat was still racy —
if /videoCache clear landed in that window, clearAll would epoch++ +
clear READY + delete files on disk, then the download thread would do
READY.put(url, finalPath) anyway, resurrecting a cleared entry and emitting
a stale "완료" message.

Add a second epoch check immediately AFTER Files.move(): if the epoch
changed, delete finalPath and return without publishing. The pre-move
check is kept too — it lets the common cancel-during-read case skip the
wasted move/delete round-trip.
2026-05-16 22:51:32 +09:00
tkrmagid
de723fd0b4 v0.4.18: fix /videoCache clear vs in-flight download race
Some checks failed
build / build (push) Has been cancelled
clearAll() previously only wiped finalized files + the IN_FLIGHT set; any
download that was already running on the single-thread executor kept
writing past the clear, then atomically moved its .part to final and
re-published into READY — resurrecting one cache entry post-clear.

Fix: add an AtomicLong CACHE_EPOCH. preload() captures the epoch at submit
time; clearAll() bumps the epoch BEFORE wiping disk; download(url, epoch)
checks at three points (pre-start, in read loop, pre-publish) and bails if
the epoch moved, deleting its own .part only AFTER closing the output
stream (Windows can't delete an open file).

Phase ordering in clearAll() also matters: bump epoch first → drop
indexes → delete files. That way the in-flight download sees the
cancellation flag before the index wipe / file delete races can interact
with it.
2026-05-16 22:48:16 +09:00
tkrmagid
e3c25fc845 v0.4.17: music_quiz datapack handshake (server + per-player presence)
Some checks failed
build / build (push) Has been cancelled
Implements docs/mc_video_player_mod_integration.md.

Server (MusicQuizPresence):
- every server tick: #server mq_video_mod = 1
- on MqHelloPayload receive: <player> mq_video_mod = 1
- both silently skip if objective absent (datapack not yet loaded)

Client (MusicQuizClient):
- send MqHelloPayload(1) on JOIN
- resend every 100 client ticks (~5 s) — mandatory because the datapack's
  mq:players/login resets per-player score to 0 at spawn-dialog passage

Payload: video_player:mq_hello, single VAR_INT body (version=1).
2026-05-16 22:40:40 +09:00
tkrmagid
2fc09deb4f v0.4.16: fix v0.4.15 reviewer-flagged regressions
Some checks failed
build / build (push) Has been cancelled
1. VideoPlayerConfig.save() now persists max_cache_mb. Previously the
   auto-augment path in load() called save(), but save() didn't emit the
   key — so the rewrite kept losing it. Now updated comment + property.

2. /videoCache clear sends a new ClearCachePayload (no body) that wipes
   the entire client video_player_cache/ directory. Previously it only
   broadcast a DeleteCachePayload per *registered* URL, so leftover files
   from legacy preload_urls or prior sessions were never cleaned; now
   we always send clearAll regardless of whether the named index was
   non-empty.

3. Downloads are now serialized through a single-thread executor instead
   of `new Thread(...).start()`. With parallel downloads, every worker
   was snapshotting cacheDirSize() before any .part was renamed to its
   final name, so 50 simultaneous joins could collectively bust the
   max_cache_mb cap. With one in-flight at a time, each download's
   directory scan reflects every preceding completion.

Network: new S2C ClearCachePayload(unit codec), registered in
VideoPlayerNetwork + ClientNetworking. VideoCache.clearAll() iterates
the dir, deletes regular files, resets READY/IN_FLIGHT, reports
deleted/failed counts in chat + log. /videoCache clear command always
broadcasts to all clients now.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-16 20:08:25 +09:00
15 changed files with 478 additions and 33 deletions

View File

@@ -5,7 +5,7 @@ org.gradle.configuration-cache=false
# Mod # Mod
mod_id=video_player mod_id=video_player
mod_version=0.4.15 mod_version=0.4.25
maven_group=com.ejclaw.videoplayer maven_group=com.ejclaw.videoplayer
archives_base_name=video_player archives_base_name=video_player

View File

@@ -1,6 +1,7 @@
package com.ejclaw.videoplayer; package com.ejclaw.videoplayer;
import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity; import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import com.ejclaw.videoplayer.client.MusicQuizClient;
import com.ejclaw.videoplayer.client.net.ClientNetworking; import com.ejclaw.videoplayer.client.net.ClientNetworking;
import com.ejclaw.videoplayer.client.playback.VideoPlayback; import com.ejclaw.videoplayer.client.playback.VideoPlayback;
import com.ejclaw.videoplayer.client.render.VideoAnchorRenderer; import com.ejclaw.videoplayer.client.render.VideoAnchorRenderer;
@@ -19,6 +20,7 @@ import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
@@ -28,6 +30,7 @@ public class VideoPlayerClient implements ClientModInitializer {
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
ClientNetworking.register(); ClientNetworking.register();
MusicQuizClient.register();
BlockEntityRendererRegistry.register( BlockEntityRendererRegistry.register(
VideoPlayerBlockEntities.VIDEO_ANCHOR, VideoPlayerBlockEntities.VIDEO_ANCHOR,
@@ -87,17 +90,26 @@ public class VideoPlayerClient implements ClientModInitializer {
* Distance is measured from the player's eye to the <em>panel center</em>, not the anchor * Distance is measured from the player's eye to the <em>panel center</em>, not the anchor
* block corner — for a 4×4 panel the corner is ~2 blocks off from where the screen visually * block corner — for a 4×4 panel the corner is ~2 blocks off from where the screen visually
* sits, which made the audio feel like it was off to the side. * sits, which made the audio feel like it was off to the side.
*
* <p>Gain is also gated by the Minecraft sound options so the in-game sliders work as
* expected: vanilla {@code SoundEngine.calculateVolume} multiplies by master × category, so
* we do the same with {@link SoundSource#PLAYERS} as the category. Result: dragging the
* "Players" slider in Options → Music & Sounds attenuates video audio just like other
* player sounds, and "Master" still gates everything.
*/ */
private static void updateDistanceGains(Minecraft client) { private static void updateDistanceGains(Minecraft client) {
LocalPlayer p = client.player; LocalPlayer p = client.player;
if (p == null || client.level == null) return; if (p == null || client.level == null) return;
Vec3 eye = p.getEyePosition(); Vec3 eye = p.getEyePosition();
float masterVol = client.options.getSoundSourceVolume(SoundSource.MASTER);
float playersVol = client.options.getSoundSourceVolume(SoundSource.PLAYERS);
float categoryScale = masterVol * playersVol;
for (BlockPos pos : VideoPlayback.activePositions()) { for (BlockPos pos : VideoPlayback.activePositions()) {
if (!(client.level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) continue; if (!(client.level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) continue;
Vec3 center = be.panelCenter(); Vec3 center = be.panelCenter();
double d = center.distanceTo(eye); double d = center.distanceTo(eye);
float attenuation = (float) Math.max(0.0, Math.min(1.0, 1.0 - d / 16.0)); float attenuation = (float) Math.max(0.0, Math.min(1.0, 1.0 - d / 16.0));
float gain = be.isMuted() ? 0F : be.getVolume() * attenuation; float gain = be.isMuted() ? 0F : be.getVolume() * attenuation * categoryScale;
VideoPlayback.setGain(pos, gain); VideoPlayback.setGain(pos, gain);
} }
} }

View File

@@ -299,10 +299,12 @@ public final class VideoPlayerConfig {
JsonObject root = new JsonObject(); JsonObject root = new JsonObject();
root.addProperty("_comment", root.addProperty("_comment",
"max_preload_mb: per-video download cap (each client). " "max_preload_mb: per-video download cap (each client). "
+ "max_cache_mb: total cache directory cap (each client). "
+ "render_distance_blocks: max distance at which a video anchor still renders. " + "render_distance_blocks: max distance at which a video anchor still renders. "
+ "preload_urls: legacy un-named auto-preload list. " + "preload_urls: legacy un-named auto-preload list. "
+ "cache_entries: managed by /videoCache add|list|remove."); + "cache_entries: managed by /videoCache add|list|remove.");
root.addProperty("max_preload_mb", maxPreloadMb); root.addProperty("max_preload_mb", maxPreloadMb);
root.addProperty("max_cache_mb", maxCacheMb);
root.addProperty("render_distance_blocks", renderDistanceBlocks); root.addProperty("render_distance_blocks", renderDistanceBlocks);
JsonArray legacyArr = new JsonArray(); JsonArray legacyArr = new JsonArray();
for (String u : preloadUrls) legacyArr.add(u); for (String u : preloadUrls) legacyArr.add(u);

View File

@@ -8,6 +8,7 @@ import com.ejclaw.videoplayer.command.VideoStickCommand;
import com.ejclaw.videoplayer.net.CachePolicyPayload; import com.ejclaw.videoplayer.net.CachePolicyPayload;
import com.ejclaw.videoplayer.net.PreloadPayload; import com.ejclaw.videoplayer.net.PreloadPayload;
import com.ejclaw.videoplayer.net.VideoPlayerNetwork; import com.ejclaw.videoplayer.net.VideoPlayerNetwork;
import com.ejclaw.videoplayer.server.MusicQuizPresence;
import com.ejclaw.videoplayer.registry.VideoPlayerBlockEntities; import com.ejclaw.videoplayer.registry.VideoPlayerBlockEntities;
import com.ejclaw.videoplayer.registry.VideoPlayerBlocks; import com.ejclaw.videoplayer.registry.VideoPlayerBlocks;
import com.ejclaw.videoplayer.registry.VideoPlayerItems; import com.ejclaw.videoplayer.registry.VideoPlayerItems;
@@ -30,6 +31,7 @@ public class VideoPlayerMod implements ModInitializer {
VideoPlayerNetwork.registerPayloadTypes(); VideoPlayerNetwork.registerPayloadTypes();
VideoPlayerNetwork.registerServerReceivers(); VideoPlayerNetwork.registerServerReceivers();
MusicQuizPresence.register();
VideoPlayerConfig.load(); VideoPlayerConfig.load();

View File

@@ -3,7 +3,11 @@ package com.ejclaw.videoplayer.block;
import com.ejclaw.videoplayer.registry.VideoPlayerBlockEntities; import com.ejclaw.videoplayer.registry.VideoPlayerBlockEntities;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.ValueInput; import net.minecraft.world.level.storage.ValueInput;
@@ -123,6 +127,35 @@ public class VideoAnchorBlockEntity extends BlockEntity {
out.putBoolean("autoplay", autoplay); out.putBoolean("autoplay", autoplay);
} }
/**
* Vanilla chunk-load BE sync. The base implementation returns an empty tag, which means
* when a client first sees this BE (chunk loads or player walks into range) it gets default
* values — url="" in particular makes the renderer no-op and the panel appears invisible.
*
* <p>Returning {@link #toNbt()} here carries the custom fields in the vanilla packet, so
* we don't depend on the {@code SyncAnchorPayload} arriving before the chunk's block-update
* packet (there's a race: {@code level.setBlock} queues a deferred chunk broadcast while
* {@code ServerPlayNetworking.send} writes immediately; if the payload wins, the client
* drops it because the BE doesn't exist yet, then the chunk packet creates the BE with
* defaults). It also fixes "player walks far away and comes back" — that path has no
* SyncAnchorPayload at all, just vanilla chunk re-sync.
*/
@Override
public CompoundTag getUpdateTag(HolderLookup.Provider provider) {
return toNbt();
}
/**
* Triggers a {@link ClientboundBlockEntityDataPacket} whenever the chunk tracker decides
* this BE needs to push an update. Default implementation returns {@code null} (no packet
* sent on BE change). Combined with {@link #getUpdateTag} above, every BE-state change a
* client sees carries the full config.
*/
@Override
public Packet<ClientGamePacketListener> getUpdatePacket() {
return ClientboundBlockEntityDataPacket.create(this);
}
@Override @Override
protected void loadAdditional(ValueInput in) { protected void loadAdditional(ValueInput in) {
super.loadAdditional(in); super.loadAdditional(in);

View File

@@ -0,0 +1,56 @@
package com.ejclaw.videoplayer.client;
import com.ejclaw.videoplayer.net.MqHelloPayload;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
/**
* Client side of the {@code music_quiz} datapack handshake
* ({@code docs/mc_video_player_mod_integration.md}). Sends one {@link MqHelloPayload}
* on JOIN, then repeats every 100 client ticks (~5 s at 20 tps).
*
* <p>The periodic resend is <em>mandatory</em>: the datapack's
* {@code mq:players/login} resets the per-player score to 0 the moment the player
* passes the spawn dialog. The single JOIN-time send can land before that reset,
* leaving the score at 0 and breaking the {@code mq:commands/start} guard. With a
* 5-second resend, the score is restored to 1 within at most one cycle.
*/
@Environment(EnvType.CLIENT)
public final class MusicQuizClient {
private MusicQuizClient() {}
/** ~5 s at 20 tps. Spec recommends ≤5 s; tighter is fine but unnecessary. */
private static final int RESEND_INTERVAL_TICKS = 100;
private static int tickCounter = 0;
public static void register() {
ClientPlayConnectionEvents.JOIN.register((handler, sender, client) ->
send());
ClientTickEvents.END_CLIENT_TICK.register(client -> {
// Gate on world presence — when the player isn't in-game, level is null and the
// counter resets so the next session starts fresh instead of firing immediately.
if (client.level == null) {
tickCounter = 0;
return;
}
tickCounter++;
if (tickCounter >= RESEND_INTERVAL_TICKS) {
tickCounter = 0;
send();
}
});
}
private static void send() {
// ClientPlayNetworking.send no-ops when the server hasn't registered the payload
// type (e.g. vanilla server or server without this mod) — safe to call blindly.
if (ClientPlayNetworking.canSend(MqHelloPayload.TYPE)) {
ClientPlayNetworking.send(new MqHelloPayload(MqHelloPayload.CURRENT_VERSION));
}
}
}

View File

@@ -6,6 +6,7 @@ import com.ejclaw.videoplayer.client.gui.VideoConfigScreen;
import com.ejclaw.videoplayer.client.playback.VideoCache; import com.ejclaw.videoplayer.client.playback.VideoCache;
import com.ejclaw.videoplayer.client.playback.VideoPlayback; import com.ejclaw.videoplayer.client.playback.VideoPlayback;
import com.ejclaw.videoplayer.net.CachePolicyPayload; import com.ejclaw.videoplayer.net.CachePolicyPayload;
import com.ejclaw.videoplayer.net.ClearCachePayload;
import com.ejclaw.videoplayer.net.DeleteCachePayload; import com.ejclaw.videoplayer.net.DeleteCachePayload;
import com.ejclaw.videoplayer.net.OpenScreenPayload; import com.ejclaw.videoplayer.net.OpenScreenPayload;
import com.ejclaw.videoplayer.net.PreloadPayload; import com.ejclaw.videoplayer.net.PreloadPayload;
@@ -57,5 +58,10 @@ public final class ClientNetworking {
ClientPlayNetworking.registerGlobalReceiver(DeleteCachePayload.TYPE, (payload, context) -> { ClientPlayNetworking.registerGlobalReceiver(DeleteCachePayload.TYPE, (payload, context) -> {
VideoCache.purge(payload.url()); VideoCache.purge(payload.url());
}); });
// /videoCache clear — wipe the entire client cache directory.
ClientPlayNetworking.registerGlobalReceiver(ClearCachePayload.TYPE, (payload, context) -> {
VideoCache.clearAll();
});
} }
} }

View File

@@ -20,6 +20,9 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
/** /**
* Client-side disk cache for preloaded HTTP video URLs. Driven by the {@code /videopreload} * Client-side disk cache for preloaded HTTP video URLs. Driven by the {@code /videopreload}
@@ -38,8 +41,30 @@ public final class VideoCache {
/** url → local absolute path of the fully-downloaded cache file. */ /** url → local absolute path of the fully-downloaded cache file. */
private static final Map<String, Path> READY = new ConcurrentHashMap<>(); private static final Map<String, Path> READY = new ConcurrentHashMap<>();
/** urls whose download is currently in flight. */ /** urls whose download is currently queued or in flight. */
private static final Set<String> IN_FLIGHT = ConcurrentHashMap.newKeySet(); private static final Set<String> IN_FLIGHT = ConcurrentHashMap.newKeySet();
/**
* Monotonic cache-generation counter. {@link #clearAll()} bumps this; every download
* captures the value at submit time and bails (deletes its {@code .part} without
* publishing) if the epoch has moved since. This is the cancellation channel for the
* in-flight download — without it, {@code clearAll} only wipes already-finalized files
* while the running download keeps writing and re-publishes one entry post-clear.
*/
private static final AtomicLong CACHE_EPOCH = new AtomicLong(0);
/**
* Single-thread executor that serializes all downloads. Cap enforcement (the total
* cache size check) needs an authoritative view of the cache directory at the moment a
* download starts, so we run one download at a time — that way the directory scan in
* {@link #cacheDirSize} reflects every finished download up to this point. Parallel
* downloads were racing the cap by each reading the directory before any of them had
* renamed their .part to final.
*/
private static final ExecutorService DOWNLOAD_POOL = Executors.newSingleThreadExecutor(r -> {
Thread t = new Thread(r, "video_player-preload");
t.setDaemon(true);
return t;
});
/** /**
* Hard ceiling on a single preload, in bytes. Default 2 GB sized to allow a single 4K * Hard ceiling on a single preload, in bytes. Default 2 GB sized to allow a single 4K
@@ -103,11 +128,73 @@ public final class VideoCache {
} }
} }
/**
* Wipe the entire cache directory and drop both indexes. Sent in response to
* {@code /videoCache clear}.
*
* <p>Three phases that need to stay in this order:
* <ol>
* <li>Bump the epoch first — that flips the cancellation flag for any in-flight
* download. The download thread checks the epoch in the read loop and at the
* move step, so after this point it will refuse to publish a new entry and
* will delete its own {@code .part}.</li>
* <li>Clear the in-memory indexes. (READY clears whatever was already finalized
* pre-clear; IN_FLIGHT is wiped so a subsequent same-URL preload re-enters
* the queue instead of getting deduped by stale state.)</li>
* <li>Best-effort delete every regular file in the cache directory. We do this
* last so that if the in-flight download was momentarily holding a {@code .part}
* open, the listing here also catches its post-close residue (though normally
* phase 1 → the download deletes its own part).</li>
* </ol>
*
* <p>Best-effort per-file deletion; logs failures but doesn't abort on the first one.
* On Windows the open {@code .part} may not be deletable here — phase 1's cancellation
* + the download's own cleanup-on-bail handles that case.
*/
public static void clearAll() {
// Phase 1: signal cancellation to any in-flight download BEFORE wiping disk.
CACHE_EPOCH.incrementAndGet();
// Phase 2: drop indexes.
READY.clear();
IN_FLIGHT.clear();
// Phase 3: delete files on disk.
int deleted = 0;
int failed = 0;
try {
Path dir = cacheDir();
if (dir != null && Files.isDirectory(dir)) {
try (var stream = Files.newDirectoryStream(dir)) {
for (Path p : stream) {
try {
if (Files.isRegularFile(p) && Files.deleteIfExists(p)) deleted++;
} catch (Throwable t) {
failed++;
VideoPlayerMod.LOG.warn("[{}] clearAll: could not delete {}: {}",
VideoPlayerMod.MOD_ID, p.getFileName(), t.toString());
}
}
}
}
} catch (Throwable t) {
VideoPlayerMod.LOG.warn("[{}] clearAll failed: {}",
VideoPlayerMod.MOD_ID, t.toString());
}
VideoPlayerMod.LOG.info("[{}] clearAll: deleted={} failed={}",
VideoPlayerMod.MOD_ID, deleted, failed);
notifyChat("[videocache] 전체 캐시 삭제: " + deleted + "개 파일", ChatFormatting.YELLOW);
}
/** Kick off a background download. No-op if already cached or in flight. */ /** Kick off a background download. No-op if already cached or in flight. */
public static void preload(String url) { public static void preload(String url) {
if (url == null || url.isEmpty()) return; if (url == null || url.isEmpty()) return;
if (!(url.startsWith("http://") || url.startsWith("https://"))) return; if (!(url.startsWith("http://") || url.startsWith("https://"))) return;
if (READY.containsKey(url)) { // Use lookup() (which also verifies the file exists on disk) instead of
// READY.containsKey — defends against READY containing a stale entry whose
// backing file was removed by clearAll() / a user-side file delete. Without this,
// a stale key would silently block a re-preload.
if (lookup(url) != null) {
VideoPlayerMod.LOG.info("[{}] preload: already cached {}", VideoPlayerMod.MOD_ID, url); VideoPlayerMod.LOG.info("[{}] preload: already cached {}", VideoPlayerMod.MOD_ID, url);
notifyChat("[videopreload] 이미 캐시됨: " + url, ChatFormatting.GRAY); notifyChat("[videopreload] 이미 캐시됨: " + url, ChatFormatting.GRAY);
return; return;
@@ -117,10 +204,12 @@ public final class VideoCache {
notifyChat("[videopreload] 이미 다운로드 중: " + url, ChatFormatting.GRAY); notifyChat("[videopreload] 이미 다운로드 중: " + url, ChatFormatting.GRAY);
return; return;
} }
notifyChat("[videopreload] 다운로드 시작: " + url, ChatFormatting.YELLOW); notifyChat("[videopreload] 다운로드 대기열 추가: " + url, ChatFormatting.YELLOW);
Thread t = new Thread(() -> download(url), "video_player-preload"); // Capture the current epoch at submit time. The download thread checks against
t.setDaemon(true); // CACHE_EPOCH later — any mismatch means clearAll() ran in between and this
t.start(); // download must abort without publishing.
long epoch = CACHE_EPOCH.get();
DOWNLOAD_POOL.submit(() -> download(url, epoch));
} }
/** Return the local cached file path for this URL, or {@code null} if not yet ready. */ /** Return the local cached file path for this URL, or {@code null} if not yet ready. */
@@ -144,25 +233,64 @@ public final class VideoCache {
// -- internals ----------------------------------------------------------------------- // -- internals -----------------------------------------------------------------------
private static void download(String url) { /**
* Publish {@code path} into {@link #READY} for {@code url}, but only if the cache
* epoch hasn't moved since {@code startEpoch} was captured. Wraps the
* pre-check / put / post-check / rollback dance so every publish site uses the
* same race-free pattern instead of re-implementing it.
*
* <p>Race coverage: if {@link #clearAll()} runs at any point between the
* pre-check and the post-check, the post-check sees the epoch bump and we
* roll back — {@link Map#remove(Object, Object)} is a compareAndRemove so we
* don't clobber a legitimate concurrent put under the same key, and we delete
* the on-disk file because clearAll's directory scan may have missed it (the
* file may not have existed yet when clearAll ran).
*
* @return {@code true} if the entry is now published; {@code false} if the
* caller's work was cancelled and {@code path} has been cleaned up.
*/
private static boolean publishIfNotCancelled(String url, Path path, long startEpoch) {
if (CACHE_EPOCH.get() != startEpoch) return false;
READY.put(url, path);
if (CACHE_EPOCH.get() != startEpoch) {
READY.remove(url, path);
try { Files.deleteIfExists(path); } catch (Throwable ignored) {}
return false;
}
return true;
}
private static void download(String url, long startEpoch) {
Path cacheDir = cacheDir(); Path cacheDir = cacheDir();
Path partPath = null;
try { try {
if (cacheDir == null) { if (cacheDir == null) {
VideoPlayerMod.LOG.warn("[{}] preload: no game dir, skipping {}", VideoPlayerMod.LOG.warn("[{}] preload: no game dir, skipping {}",
VideoPlayerMod.MOD_ID, url); VideoPlayerMod.MOD_ID, url);
return; return;
} }
// Pre-flight cancellation check — if clearAll already ran between submit and now,
// skip the whole thing. Avoids creating directories / .part files post-clear.
if (CACHE_EPOCH.get() != startEpoch) {
VideoPlayerMod.LOG.info("[{}] preload: cancelled before start (clearAll ran) — {}",
VideoPlayerMod.MOD_ID, url);
return;
}
Files.createDirectories(cacheDir); Files.createDirectories(cacheDir);
String hash = sha256(url); String hash = sha256(url);
String ext = extensionFromUrl(url); String ext = extensionFromUrl(url);
Path finalPath = cacheDir.resolve(hash + ext); Path finalPath = cacheDir.resolve(hash + ext);
Path partPath = cacheDir.resolve(hash + ext + ".part"); partPath = cacheDir.resolve(hash + ext + ".part");
// Resume-friendly: if the file's already on disk from an earlier session, just // Resume-friendly: if the file's already on disk from an earlier session, just
// index it without re-downloading. // index it without re-downloading.
if (Files.exists(finalPath) && Files.size(finalPath) > 0) { if (Files.exists(finalPath) && Files.size(finalPath) > 0) {
READY.put(url, finalPath); if (!publishIfNotCancelled(url, finalPath, startEpoch)) {
VideoPlayerMod.LOG.info("[{}] preload: reindex cancelled (clearAll ran) — {}",
VideoPlayerMod.MOD_ID, url);
return;
}
VideoPlayerMod.LOG.info("[{}] preload: indexed existing cache {} -> {}", VideoPlayerMod.LOG.info("[{}] preload: indexed existing cache {} -> {}",
VideoPlayerMod.MOD_ID, url, finalPath.getFileName()); VideoPlayerMod.MOD_ID, url, finalPath.getFileName());
notifyChat("[videopreload] 기존 캐시 사용: " + url, ChatFormatting.GREEN); notifyChat("[videopreload] 기존 캐시 사용: " + url, ChatFormatting.GREEN);
@@ -201,21 +329,30 @@ public final class VideoCache {
} }
long total = 0; long total = 0;
boolean cancelled = false;
try (InputStream in = raw.getInputStream(); try (InputStream in = raw.getInputStream();
OutputStream out = Files.newOutputStream(partPath)) { OutputStream out = Files.newOutputStream(partPath)) {
byte[] buf = new byte[64 * 1024]; byte[] buf = new byte[64 * 1024];
int n; int n;
while ((n = in.read(buf)) >= 0) { while ((n = in.read(buf)) >= 0) {
// Cancellation check inside the loop. Break (not return) so the try-with
// closes the output stream first — on Windows, deleting an open .part can
// fail with AccessDeniedException, so we always close before deleting.
if (CACHE_EPOCH.get() != startEpoch) {
cancelled = true;
break;
}
total += n; total += n;
if (total > MAX_BYTES) { if (total > MAX_BYTES) {
long capMb = MAX_BYTES / (1024 * 1024); long capMb = MAX_BYTES / (1024 * 1024);
VideoPlayerMod.LOG.warn( VideoPlayerMod.LOG.warn(
"[{}] preload: {} exceeded per-video {} MB cap; aborting", "[{}] preload: {} exceeded per-video {} MB cap; aborting",
VideoPlayerMod.MOD_ID, url, capMb); VideoPlayerMod.MOD_ID, url, capMb);
try { Files.deleteIfExists(partPath); } catch (Throwable ignored) {} // Same close-before-delete dance for Windows.
cancelled = true;
notifyChat("[videopreload] 실패 (단일 영상 " + capMb + "MB 초과): " + url, notifyChat("[videopreload] 실패 (단일 영상 " + capMb + "MB 초과): " + url,
ChatFormatting.RED); ChatFormatting.RED);
return; break;
} }
if (existingCacheBytes + total > MAX_CACHE_BYTES) { if (existingCacheBytes + total > MAX_CACHE_BYTES) {
long capMb = MAX_CACHE_BYTES / (1024 * 1024); long capMb = MAX_CACHE_BYTES / (1024 * 1024);
@@ -223,18 +360,42 @@ public final class VideoCache {
VideoPlayerMod.LOG.warn( VideoPlayerMod.LOG.warn(
"[{}] preload: total-cache cap exceeded ({}>{} MB); aborting {}", "[{}] preload: total-cache cap exceeded ({}>{} MB); aborting {}",
VideoPlayerMod.MOD_ID, usedMb, capMb, url); VideoPlayerMod.MOD_ID, usedMb, capMb, url);
try { Files.deleteIfExists(partPath); } catch (Throwable ignored) {} cancelled = true;
notifyChat("[videopreload] 실패 (전체 캐시 " + capMb + "MB 초과): " + url, notifyChat("[videopreload] 실패 (전체 캐시 " + capMb + "MB 초과): " + url,
ChatFormatting.RED); ChatFormatting.RED);
return; break;
} }
out.write(buf, 0, n); out.write(buf, 0, n);
} }
} }
// Now the .part file is closed — safe to delete on Windows.
if (cancelled) {
try { Files.deleteIfExists(partPath); } catch (Throwable ignored) {}
return;
}
// Pre-move cancellation check. If clearAll ran during the read loop, abort
// before promoting .part to final — saves a wasted move + delete.
if (CACHE_EPOCH.get() != startEpoch) {
VideoPlayerMod.LOG.info("[{}] preload: cancelled before move (clearAll ran) — {}",
VideoPlayerMod.MOD_ID, url);
try { Files.deleteIfExists(partPath); } catch (Throwable ignored) {}
return;
}
Files.move(partPath, finalPath, StandardCopyOption.REPLACE_EXISTING, Files.move(partPath, finalPath, StandardCopyOption.REPLACE_EXISTING,
StandardCopyOption.ATOMIC_MOVE); StandardCopyOption.ATOMIC_MOVE);
READY.put(url, finalPath);
// Race-safe publish: this covers the window between Files.move and READY.put
// (clearAll deletes the freshly-moved file then we resurrect it in READY) AND
// the window between READY.put and the "완료" notification (clearAll wipes
// READY then we re-publish + emit stale completion chat). publishIfNotCancelled
// rolls back both READY and the on-disk file if the epoch moved at any time.
if (!publishIfNotCancelled(url, finalPath, startEpoch)) {
VideoPlayerMod.LOG.info("[{}] preload: cancelled at publish (clearAll ran) — {}",
VideoPlayerMod.MOD_ID, url);
return;
}
VideoPlayerMod.LOG.info("[{}] preload: cached {} ({} bytes) -> {}", VideoPlayerMod.LOG.info("[{}] preload: cached {} ({} bytes) -> {}",
VideoPlayerMod.MOD_ID, url, total, finalPath.getFileName()); VideoPlayerMod.MOD_ID, url, total, finalPath.getFileName());
long mb = Math.max(1, total / (1024 * 1024)); long mb = Math.max(1, total / (1024 * 1024));
@@ -244,6 +405,10 @@ public final class VideoCache {
VideoPlayerMod.MOD_ID, url, t.toString()); VideoPlayerMod.MOD_ID, url, t.toString());
notifyChat("[videopreload] 실패 (" + t.getClass().getSimpleName() + "): " + url, notifyChat("[videopreload] 실패 (" + t.getClass().getSimpleName() + "): " + url,
ChatFormatting.RED); ChatFormatting.RED);
// Best-effort cleanup of any leftover .part on the error path.
if (partPath != null) {
try { Files.deleteIfExists(partPath); } catch (Throwable ignored) {}
}
} finally { } finally {
IN_FLIGHT.remove(url); IN_FLIGHT.remove(url);
} }

View File

@@ -31,8 +31,19 @@ import org.joml.Matrix4f;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class VideoAnchorRenderer implements BlockEntityRenderer<VideoAnchorBlockEntity, VideoAnchorRenderer.State> { public class VideoAnchorRenderer implements BlockEntityRenderer<VideoAnchorBlockEntity, VideoAnchorRenderer.State> {
/** Tiny outward offset so the quad doesn't z-fight with the wall. */ /**
private static final float SURFACE_EPSILON = 0.001F; * Outward offset so the quad doesn't z-fight with the wall it sits on.
*
* <p>Depth-buffer precision drops with the square of view distance: with near=0.05 and
* 24-bit depth, the smallest resolvable step at 30 blocks is ~1mm, and ~12mm at 100
* blocks. The old 0.001 (1mm) offset was right at the precision boundary at ~30 blocks
* — which is exactly the distance users started seeing the wall texture flicker through
* the video panel once {@code render_distance_blocks} was raised past the default.
*
* <p>2cm gives ~20× margin at 30 blocks and is still visually unnoticeable up close
* (~3% of a block thickness).
*/
private static final float SURFACE_EPSILON = 0.02F;
public VideoAnchorRenderer(BlockEntityRendererProvider.Context ctx) { public VideoAnchorRenderer(BlockEntityRendererProvider.Context ctx) {
// no-op // no-op
@@ -75,7 +86,12 @@ public class VideoAnchorRenderer implements BlockEntityRenderer<VideoAnchorBlock
pose.translate(-0.5F, -0.5F, -0.5F + SURFACE_EPSILON); pose.translate(-0.5F, -0.5F, -0.5F + SURFACE_EPSILON);
final Matrix4f mat = new Matrix4f(pose.last().pose()); final Matrix4f mat = new Matrix4f(pose.last().pose());
RenderType rt = RenderTypes.entityCutout(tex); // entitySolid (not entityCutout): video frames come from swscale → AV_PIX_FMT_RGBA with
// alpha hard-set to 255, so there is no alpha-tested cutout. Cutout's alpha-discard step
// adds nothing here and makes distant sampling unstable — without mipmaps on a dynamic
// texture, neighbouring texels can shimmer above/below the discard threshold at sub-pixel
// sampling rates, contributing to the flicker users see once render distance is raised.
RenderType rt = RenderTypes.entitySolid(tex);
collector.submitCustomGeometry(pose, rt, (poseUnused, vc) -> { collector.submitCustomGeometry(pose, rt, (poseUnused, vc) -> {
// Single-sided: the back of the anchor is by design pressed against the wall the // Single-sided: the back of the anchor is by design pressed against the wall the
// player clicked, so a back face is pure GPU waste. Halves the fragment shader work // player clicked, so a back face is pure GPU waste. Halves the fragment shader work

View File

@@ -1,6 +1,7 @@
package com.ejclaw.videoplayer.command; package com.ejclaw.videoplayer.command;
import com.ejclaw.videoplayer.VideoPlayerConfig; import com.ejclaw.videoplayer.VideoPlayerConfig;
import com.ejclaw.videoplayer.net.ClearCachePayload;
import com.ejclaw.videoplayer.net.DeleteCachePayload; import com.ejclaw.videoplayer.net.DeleteCachePayload;
import com.ejclaw.videoplayer.net.PreloadPayload; import com.ejclaw.videoplayer.net.PreloadPayload;
import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.CommandDispatcher;
@@ -127,26 +128,26 @@ public final class VideoCacheCommand {
private static int runClear(CommandContext<CommandSourceStack> ctx) { private static int runClear(CommandContext<CommandSourceStack> ctx) {
CommandSourceStack src = ctx.getSource(); CommandSourceStack src = ctx.getSource();
// Drop server-side named entries (preload_urls is left alone — it's an admin-edited
// list, not something /videoCache manages).
java.util.List<String> urls = VideoPlayerConfig.clearCacheEntries(); java.util.List<String> urls = VideoPlayerConfig.clearCacheEntries();
if (urls.isEmpty()) {
src.sendSuccess(() -> Component.literal("[videocache] 저장된 항목이 없습니다") // Always broadcast a full-cache wipe to every client, even if the named index was
.withStyle(ChatFormatting.GRAY), false); // empty — leftover files from prior sessions, legacy preload_urls downloads, and
return 0; // any in-flight stragglers all get scrubbed in one shot.
}
MinecraftServer server = src.getServer(); MinecraftServer server = src.getServer();
ClearCachePayload payload = new ClearCachePayload();
int clients = 0; int clients = 0;
for (ServerPlayer p : PlayerLookup.all(server)) { for (ServerPlayer p : PlayerLookup.all(server)) {
for (String url : urls) { ServerPlayNetworking.send(p, payload);
ServerPlayNetworking.send(p, new DeleteCachePayload(url));
}
clients++; clients++;
} }
final int sentFinal = clients; final int sentFinal = clients;
final int countFinal = urls.size(); final int countFinal = urls.size();
src.sendSuccess(() -> Component.literal( src.sendSuccess(() -> Component.literal(
"[videocache] 전체 삭제: " + countFinal + "항목" "[videocache] 전체 삭제: 등록 항목 " + countFinal + "제거"
+ " (" + sentFinal + " 클라이언트에 cache_delete 전송)"), false); + " + " + sentFinal + " 클라이언트 디스크 캐시 전체 wipe"), false);
return countFinal; return Math.max(countFinal, 1);
} }
private static int runRemove(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException { private static int runRemove(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {

View File

@@ -22,7 +22,13 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.permissions.Permissions; import net.minecraft.server.permissions.Permissions;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
/** SPEC §4.5.1 — {@code /videoPlace <pos> <facing> <width> <height> <url>} */ /**
* SPEC §4.5.1 — {@code /videoPlace <pos> <facing> <width> <height> <volume> <url>}.
*
* <p>{@code volume} is an integer 0..100 (percent) or {@code -1} to start muted. The percent
* form mirrors the GUI slider; {@code -1} is a CLI shortcut so admins don't need a follow-up
* {@code /videoMute} step.
*/
public final class VideoPlaceCommand { public final class VideoPlaceCommand {
private VideoPlaceCommand() {} private VideoPlaceCommand() {}
@@ -38,8 +44,9 @@ public final class VideoPlaceCommand {
.then(Commands.argument("facing", StringArgumentType.word()) .then(Commands.argument("facing", StringArgumentType.word())
.then(Commands.argument("width", IntegerArgumentType.integer(1, 32)) .then(Commands.argument("width", IntegerArgumentType.integer(1, 32))
.then(Commands.argument("height", IntegerArgumentType.integer(1, 32)) .then(Commands.argument("height", IntegerArgumentType.integer(1, 32))
.then(Commands.argument("url", StringArgumentType.greedyString()) .then(Commands.argument("volume", IntegerArgumentType.integer(-1, 100))
.executes(VideoPlaceCommand::run)))))); .then(Commands.argument("url", StringArgumentType.greedyString())
.executes(VideoPlaceCommand::run)))))));
} }
private static int run(com.mojang.brigadier.context.CommandContext<CommandSourceStack> ctx) private static int run(com.mojang.brigadier.context.CommandContext<CommandSourceStack> ctx)
@@ -54,6 +61,12 @@ public final class VideoPlaceCommand {
} }
int width = IntegerArgumentType.getInteger(ctx, "width"); int width = IntegerArgumentType.getInteger(ctx, "width");
int height = IntegerArgumentType.getInteger(ctx, "height"); int height = IntegerArgumentType.getInteger(ctx, "height");
int volumeArg = IntegerArgumentType.getInteger(ctx, "volume");
// -1 is the CLI mute shortcut; the BE keeps the underlying volume so an admin can
// /videoMute false later without re-typing a level. Anything 0..100 sets %-volume and
// clears mute.
boolean placeMuted = volumeArg < 0;
float placeVolume = placeMuted ? 0.5F : (volumeArg / 100.0F);
String raw = StringArgumentType.getString(ctx, "url").trim(); String raw = StringArgumentType.getString(ctx, "url").trim();
// Accept either an http(s) URL or a /videoCache add <name> entry: resolveUrlOrName() // Accept either an http(s) URL or a /videoCache add <name> entry: resolveUrlOrName()
// returns the canonical URL in both cases, or null when a non-URL string didn't match // returns the canonical URL in both cases, or null when a non-URL string didn't match
@@ -75,6 +88,8 @@ public final class VideoPlaceCommand {
be.setWidth(width); be.setWidth(width);
be.setHeight(height); be.setHeight(height);
be.setUrl(url); be.setUrl(url);
be.setVolume(placeVolume);
be.setMuted(placeMuted);
CompoundTag nbt = be.toNbt(); CompoundTag nbt = be.toNbt();
for (ServerPlayer p : PlayerLookup.tracking(level, pos)) { for (ServerPlayer p : PlayerLookup.tracking(level, pos)) {

View File

@@ -0,0 +1,26 @@
package com.ejclaw.videoplayer.net;
import com.ejclaw.videoplayer.VideoPlayerMod;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.Identifier;
/**
* S2C — tell every client to wipe its entire {@code video_player_cache} directory and reset
* the in-memory READY/IN_FLIGHT index. Sent by {@code /videoCache clear}. Carries no payload —
* the receiving client just nukes everything under the cache dir regardless of how the file
* got there (named entry, legacy preload_url, or leftover from a prior session).
*/
public record ClearCachePayload() implements CustomPacketPayload {
public static final CustomPacketPayload.Type<ClearCachePayload> TYPE =
new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "cache_clear"));
public static final StreamCodec<RegistryFriendlyByteBuf, ClearCachePayload> CODEC =
StreamCodec.unit(new ClearCachePayload());
@Override
public Type<? extends CustomPacketPayload> type() {
return TYPE;
}
}

View File

@@ -0,0 +1,35 @@
package com.ejclaw.videoplayer.net;
import com.ejclaw.videoplayer.VideoPlayerMod;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.Identifier;
/**
* C2S — client-presence handshake for the {@code music_quiz} datapack
* ({@code docs/mc_video_player_mod_integration.md}). Each modded client sends one on JOIN
* and one every ~5 s thereafter. The server side flips the player's {@code mq_video_mod}
* scoreboard score to {@code 1}, which the datapack reads in its {@code mq:commands/start}
* guard.
*
* <p>Payload body is a single int (protocol version) so future schema bumps don't require
* a new packet id. v1 is the only version that exists today.
*/
public record MqHelloPayload(int version) implements CustomPacketPayload {
public static final int CURRENT_VERSION = 1;
public static final CustomPacketPayload.Type<MqHelloPayload> TYPE =
new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "mq_hello"));
public static final StreamCodec<RegistryFriendlyByteBuf, MqHelloPayload> CODEC = StreamCodec.composite(
ByteBufCodecs.VAR_INT, MqHelloPayload::version,
MqHelloPayload::new
);
@Override
public Type<? extends CustomPacketPayload> type() {
return TYPE;
}
}

View File

@@ -28,9 +28,11 @@ public final class VideoPlayerNetwork {
PayloadTypeRegistry.clientboundPlay().register(PreloadPayload.TYPE, PreloadPayload.CODEC); PayloadTypeRegistry.clientboundPlay().register(PreloadPayload.TYPE, PreloadPayload.CODEC);
PayloadTypeRegistry.clientboundPlay().register(CachePolicyPayload.TYPE, CachePolicyPayload.CODEC); PayloadTypeRegistry.clientboundPlay().register(CachePolicyPayload.TYPE, CachePolicyPayload.CODEC);
PayloadTypeRegistry.clientboundPlay().register(DeleteCachePayload.TYPE, DeleteCachePayload.CODEC); PayloadTypeRegistry.clientboundPlay().register(DeleteCachePayload.TYPE, DeleteCachePayload.CODEC);
PayloadTypeRegistry.clientboundPlay().register(ClearCachePayload.TYPE, ClearCachePayload.CODEC);
// C2S // C2S
PayloadTypeRegistry.serverboundPlay().register(SaveConfigPayload.TYPE, SaveConfigPayload.CODEC); PayloadTypeRegistry.serverboundPlay().register(SaveConfigPayload.TYPE, SaveConfigPayload.CODEC);
PayloadTypeRegistry.serverboundPlay().register(DeleteAnchorPayload.TYPE, DeleteAnchorPayload.CODEC); PayloadTypeRegistry.serverboundPlay().register(DeleteAnchorPayload.TYPE, DeleteAnchorPayload.CODEC);
PayloadTypeRegistry.serverboundPlay().register(MqHelloPayload.TYPE, MqHelloPayload.CODEC);
} }
public static void registerServerReceivers() { public static void registerServerReceivers() {

View File

@@ -0,0 +1,74 @@
package com.ejclaw.videoplayer.server;
import com.ejclaw.videoplayer.VideoPlayerMod;
import com.ejclaw.videoplayer.net.MqHelloPayload;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.scores.Objective;
import net.minecraft.world.scores.ScoreHolder;
import net.minecraft.world.scores.Scoreboard;
/**
* Implements the server side of the {@code music_quiz} datapack handshake described in
* {@code docs/mc_video_player_mod_integration.md}.
*
* <p>Two scoreboard writes against objective {@code mq_video_mod} (dummy):
* <ul>
* <li>Every server tick — {@code #server mq_video_mod = 1}. Proves the mod jar is on the
* server side. The datapack's {@code mq:commands/start} guard checks this first.</li>
* <li>Every received {@link MqHelloPayload} — {@code <player> mq_video_mod = 1}. Proves
* the sending player's client has the mod installed. Per-player flag is needed
* because rendering is client-side; the server can't tell from join state alone.</li>
* </ul>
*
* <p>The objective itself ({@code scoreboard objectives add mq_video_mod dummy}) is
* created by the datapack's {@code mq:load} function. If it isn't present yet (datapack
* not applied, or load hasn't run), the writes are silently skipped — when the datapack
* appears later, the next tick / next payload arrival populates it.
*/
public final class MusicQuizPresence {
private MusicQuizPresence() {}
/** Scoreboard objective name expected by the {@code music_quiz} datapack. */
private static final String OBJECTIVE = "mq_video_mod";
/** Fake holder used to mark "the server has the mod" (datapack reads {@code #server}). */
private static final String SERVER_HOLDER = "#server";
/** Call from {@code VideoPlayerMod.onInitialize} after payload types are registered. */
public static void register() {
// (a) per-tick server presence
ServerTickEvents.END_SERVER_TICK.register(MusicQuizPresence::onServerTick);
// (b) per-player client presence — flipped on every received Hello
ServerPlayNetworking.registerGlobalReceiver(MqHelloPayload.TYPE, (payload, context) -> {
ServerPlayer player = context.player();
MinecraftServer server = context.server();
// hop back onto the server thread before touching the scoreboard
server.execute(() -> markPlayerPresent(server, player));
});
}
private static void onServerTick(MinecraftServer server) {
Scoreboard sb = server.getScoreboard();
Objective obj = sb.getObjective(OBJECTIVE);
// Datapack not loaded yet — silently skip. The score holder doesn't exist until
// the objective does, and trying to write blind would just blow up.
if (obj == null) return;
sb.getOrCreatePlayerScore(ScoreHolder.forNameOnly(SERVER_HOLDER), obj).set(1);
}
private static void markPlayerPresent(MinecraftServer server, ServerPlayer player) {
Scoreboard sb = server.getScoreboard();
Objective obj = sb.getObjective(OBJECTIVE);
if (obj == null) {
VideoPlayerMod.LOG.debug("[{}] mq hello from {} but objective '{}' not present",
VideoPlayerMod.MOD_ID, player.getName().getString(), OBJECTIVE);
return;
}
// ServerPlayer itself implements ScoreHolder, so this matches selector @s on the
// datapack side without name-formatting quirks (uuid vs profile name).
sb.getOrCreatePlayerScore(player, obj).set(1);
}
}