Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c55a9e4e05 | ||
|
|
b0c7532715 | ||
|
|
229f499465 |
@@ -5,7 +5,7 @@ org.gradle.configuration-cache=false
|
||||
|
||||
# Mod
|
||||
mod_id=video_player
|
||||
mod_version=0.4.27
|
||||
mod_version=0.4.30
|
||||
maven_group=com.ejclaw.videoplayer
|
||||
archives_base_name=video_player
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.ejclaw.videoplayer;
|
||||
import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
|
||||
import com.ejclaw.videoplayer.client.MusicQuizClient;
|
||||
import com.ejclaw.videoplayer.client.net.ClientNetworking;
|
||||
import com.ejclaw.videoplayer.client.playback.VideoCache;
|
||||
import com.ejclaw.videoplayer.client.playback.VideoPlayback;
|
||||
import com.ejclaw.videoplayer.client.render.VideoAnchorRenderer;
|
||||
import com.ejclaw.videoplayer.item.VideoStickItem;
|
||||
@@ -12,6 +13,7 @@ import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientBlockEntityEvents;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
|
||||
@@ -82,6 +84,11 @@ public class VideoPlayerClient implements ClientModInitializer {
|
||||
}
|
||||
});
|
||||
|
||||
// Wipe video_player_cache/ on game exit so preloaded clips don't pile up across
|
||||
// sessions. Cache entries are re-broadcast by the server on every JOIN, so a freshly
|
||||
// started game will repopulate the cache automatically.
|
||||
ClientLifecycleEvents.CLIENT_STOPPING.register(client -> VideoCache.wipeOnShutdown());
|
||||
|
||||
VideoPlayerMod.LOG.info("[{}] client initialized", VideoPlayerMod.MOD_ID);
|
||||
}
|
||||
|
||||
|
||||
@@ -226,6 +226,40 @@ public final class VideoCache {
|
||||
IN_FLIGHT.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* Wipe the cache directory at game shutdown so the user doesn't accumulate disk usage
|
||||
* across sessions. Distinct from {@link #clearAll()}: at shutdown there are no concurrent
|
||||
* downloads to race and no player to chat-notify, so we skip the chat ping but still bump
|
||||
* the epoch (defensive — any straggler write inside the in-flight {@code .part} stream
|
||||
* will detect the bump and self-clean) and drop indexes.
|
||||
*/
|
||||
public static void wipeOnShutdown() {
|
||||
CACHE_EPOCH.incrementAndGet();
|
||||
READY.clear();
|
||||
IN_FLIGHT.clear();
|
||||
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++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
VideoPlayerMod.LOG.warn("[{}] wipeOnShutdown failed: {}",
|
||||
VideoPlayerMod.MOD_ID, t.toString());
|
||||
}
|
||||
VideoPlayerMod.LOG.info("[{}] wipeOnShutdown: deleted={} failed={}",
|
||||
VideoPlayerMod.MOD_ID, deleted, failed);
|
||||
}
|
||||
|
||||
/** Caller-supplied: current set of URLs that are fully cached, for diagnostics. */
|
||||
public static Set<String> readyUrls() {
|
||||
return new HashSet<>(READY.keySet());
|
||||
@@ -250,7 +284,13 @@ public final class VideoCache {
|
||||
* 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;
|
||||
// If the wipe ran between download's pre-move epoch check and Files.move, its
|
||||
// directory scan won't have seen this just-promoted file. We must delete it here,
|
||||
// not just bail — otherwise the freshly-moved final file leaks across shutdown.
|
||||
if (CACHE_EPOCH.get() != startEpoch) {
|
||||
try { Files.deleteIfExists(path); } catch (Throwable ignored) {}
|
||||
return false;
|
||||
}
|
||||
READY.put(url, path);
|
||||
if (CACHE_EPOCH.get() != startEpoch) {
|
||||
READY.remove(url, path);
|
||||
|
||||
@@ -6,13 +6,18 @@ import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.commands.Commands;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.permissions.Permissions;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
public final class VideoStickCommand {
|
||||
private VideoStickCommand() {}
|
||||
|
||||
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
|
||||
// OP/console/command-block 만 사용 가능. Permissions.COMMANDS_GAMEMASTER = level 2,
|
||||
// 즉 /op 받은 플레이어(level 4) 와 콘솔(level 4), command block(default level 2) 통과.
|
||||
// 일반 플레이어(level 0) 는 탭 자동완성에도 안 떠야 정상.
|
||||
dispatcher.register(Commands.literal("videoStick")
|
||||
.requires(s -> s.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
|
||||
.executes(ctx -> run(ctx.getSource())));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user