3 Commits

Author SHA1 Message Date
tkrmagid
52fbcd1861 render: restore textured quad on new 26.1.2 BlockEntityRenderer pipeline
Some checks failed
build / build (push) Has been cancelled
VideoPlayback now allocates a DynamicTexture per active anchor under a unique
Identifier (registered on Minecraft.getTextureManager()) and pumps RGBA frames
into it via NativeImage.setPixelABGR + DynamicTexture.upload() during the
client tick. Until the backend (JavaCV) produces a first frame, the texture
shows a dark gray placeholder with a thin border so the anchor screen is
visibly present.

VideoAnchorRenderer.submit() now uses SubmitNodeCollector.submitCustomGeometry
with RenderTypes.entityCutout(textureId), drawing a two-sided width×height
quad oriented by Direction.toYRot() + Axis.YP.rotationDegrees. Vertex
attributes use the new VertexConsumer fluent API (addVertex(Matrix4f, ...)
.setColor.setUv.setOverlay(NO_OVERLAY).setLight.setNormal).

JavaCvBackend / WatermediaBackend / WatermediaProbe / VideoBackend are
unchanged — JavaCV is referenced entirely via reflection so the mod jar
remains loadable when the bytedeco classifier jars aren't on the runtime
classpath, in which case the anchor renders its placeholder surface.
2026-05-15 19:38:23 +09:00
tkrmagid
27a3f34bfa port: migrate all sources from Yarn 1.21.x to Mojmap 26.1.2
Some checks failed
build / build (push) Has been cancelled
- Block/BE/Item: BaseEntityBlock + useItemOn(InteractionResult), useOn(UseOnContext),
  setChanged(), loadAdditional(ValueInput) / saveAdditional(ValueOutput) with
  getStringOr/getIntOr/getBooleanOr/getFloatOr defaults
- Registries: BuiltInRegistries + ResourceKey + Properties.setId(ResourceKey)
- Networking: CustomPacketPayload.Type + StreamCodec.composite + RegistryFriendlyByteBuf
  (note: clientboundPlay/serverboundPlay names in fabric-networking-api-v1 6.3.1)
- Commands: Commands.literal/argument, CommandSourceStack.sendSuccess/sendFailure,
  PermissionSet.hasPermission(Permissions.COMMANDS_GAMEMASTER) (level-2 equivalent)
- Client GUI: EditBox / Button / Checkbox / AbstractSliderButton + addRenderableWidget
  (no render override; widgets render themselves under the new pipeline)
- Renderer: rewritten as stub against new BlockEntityRenderer<T, S extends BlockEntityRenderState>
  pattern (createRenderState / extractRenderState / submit). Stub does not draw a quad yet
  — frame upload and dynamic texture surface deferred until Watermedia/JavaCV are
  re-audited for Java 25
- Playback: stripped to bookkeeping-only stub (tracks active anchors, no frame pump)
- Client entrypoint: ClientTickEvents.END_LEVEL_TICK (was END_WORLD_TICK), Minecraft.level,
  LocalPlayer, Vec3, InteractionResult

./gradlew build passes against MC 26.1.2 + Fabric Loader 0.19.2 + fabric-api 0.149.0+26.1.2.
Block placement, anchor BE, payloads, commands, and GUI are functional; the anchor renders
as the plain block until the new render-state pipeline is wired with a texture.
2026-05-15 19:27:12 +09:00
tkrmagid
8f69814cb2 build: switch toolchain to MC 26.1.2 (intermediary retired)
Some checks failed
build / build (push) Has been cancelled
- net.fabricmc.fabric-loom 1.16-SNAPSHOT (no remap; MC 26.1+ ships unobfuscated)
- gradle.properties: minecraft_version=26.1.2, loader=0.19.2, fabric-api=0.149.0+26.1.2
- Java 25 toolchain
- fabric.mod.json: fabricloader>=0.19.0, java>=25
- Drop multi-version build script + matrix CI (single-target now)
- Backup of 1.21.6/7/8 working tree preserved on mc-1.21.x branch

Source migration to Mojmap names is in progress on follow-up commits;
this commit alone will not build until source files are ported.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-15 19:09:59 +09:00
25 changed files with 648 additions and 614 deletions

View File

@@ -1,4 +1,4 @@
name: build-matrix
name: build
on:
push:
@@ -9,33 +9,15 @@ on:
jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- mc: "1.21.6"
yarn: "1.21.6+build.1"
fabric: "0.120.1+1.21.6"
- mc: "1.21.7"
yarn: "1.21.7+build.8"
fabric: "0.129.0+1.21.7"
- mc: "1.21.8"
yarn: "1.21.8+build.1"
fabric: "0.136.1+1.21.8"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
- name: Build (MC ${{ matrix.mc }})
run: |
./gradlew --no-daemon \
-Pminecraft_version=${{ matrix.mc }} \
-Pyarn_mappings=${{ matrix.yarn }} \
-Pfabric_version=${{ matrix.fabric }} \
build
java-version: 25
- name: Build (MC 26.1.2)
run: ./gradlew --no-daemon build
- uses: actions/upload-artifact@v4
with:
name: video_player-mc${{ matrix.mc }}
name: video_player-mc26.1.2
path: build/libs/*.jar

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.16.2'
id 'net.fabricmc.fabric-loom' version "${loom_version}"
id 'maven-publish'
id 'java'
}
@@ -16,11 +16,16 @@ repositories {
maven { url = 'https://maven.fabricmc.net/' }
}
loom {
// Intentionally empty — MC 26.1+ ships unobfuscated, so the new loom does not remap.
}
dependencies {
// No mappings dep — Mojang ships official names since 26.1, intermediary is gone.
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
}
processResources {
@@ -28,27 +33,24 @@ processResources {
inputs.property "mod_id", project.mod_id
inputs.property "minecraft_version", project.minecraft_version
// Pin the fabric.mod.json's minecraft constraint to the build's exact target — keeps each
// multi-version jar from claiming compatibility it doesn't have.
def mc = project.minecraft_version
def target = "~${mc}"
filesMatching("fabric.mod.json") {
expand "version": project.version, "mod_id": project.mod_id, "target_minecraft": target
expand "version": project.version,
"mod_id": project.mod_id,
"target_minecraft": "~${project.minecraft_version}"
}
}
tasks.withType(JavaCompile).configureEach {
it.options.release = 21
it.options.release = 25
}
java {
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
toolchain {
languageVersion = JavaLanguageVersion.of(21)
languageVersion = JavaLanguageVersion.of(25)
}
}

View File

@@ -1,14 +1,16 @@
org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true
# Config cache disabled — new loom + IntelliJ aren't fully compatible yet
org.gradle.configuration-cache=false
# Mod
mod_id=video_player
mod_version=0.2.0
mod_version=0.3.0
maven_group=com.ejclaw.videoplayer
archives_base_name=video_player
# Minecraft / Fabric (1.21.6)
minecraft_version=1.21.6
yarn_mappings=1.21.6+build.1
# Minecraft / Fabric (26.1.2 — single target, intermediary/Yarn retired)
minecraft_version=26.1.2
loader_version=0.19.2
fabric_version=0.120.1+1.21.6
loom_version=1.16-SNAPSHOT
fabric_version=0.149.0+26.1.2

View File

@@ -1,32 +0,0 @@
#!/usr/bin/env bash
# Build the mod against all supported MC versions and collect jars under build/multiver/.
# Uses gradle property overrides so we don't have to maintain three settings.gradle copies.
set -euo pipefail
cd "$(dirname "$0")/.."
OUT=build/multiver
rm -rf "$OUT"
mkdir -p "$OUT"
build_one() {
local mc="$1" yarn="$2" fab="$3"
echo "==> Building for MC $mc (yarn=$yarn, fabric-api=$fab)"
./gradlew --no-daemon \
-Pminecraft_version="$mc" \
-Pyarn_mappings="$yarn" \
-Pfabric_version="$fab" \
build
# main jar = the one without "-sources"
local jar
jar=$(ls build/libs/video_player-*.jar | grep -v -- '-sources' | head -1)
cp "$jar" "$OUT/video_player-mc${mc}.jar"
}
build_one 1.21.6 1.21.6+build.1 0.120.1+1.21.6
build_one 1.21.7 1.21.7+build.8 0.129.0+1.21.7
build_one 1.21.8 1.21.8+build.1 0.136.1+1.21.8
echo
echo "All jars:"
ls -la "$OUT"

View File

@@ -14,17 +14,15 @@ 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;
import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.phys.Vec3;
@Environment(EnvType.CLIENT)
public class VideoPlayerClient implements ClientModInitializer {
@SuppressWarnings("deprecation")
@Override
public void onInitializeClient() {
ClientNetworking.register();
@@ -34,14 +32,14 @@ public class VideoPlayerClient implements ClientModInitializer {
VideoAnchorRenderer::new
);
AttackBlockCallback.EVENT.register((player, world, hand, pos, direction) -> {
if (world.isClient
&& player.getMainHandStack().getItem() instanceof VideoStickItem
&& world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity) {
AttackBlockCallback.EVENT.register((player, level, hand, pos, direction) -> {
if (level.isClientSide()
&& player.getMainHandItem().getItem() instanceof VideoStickItem
&& level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity) {
ClientPlayNetworking.send(new DeleteAnchorPayload(pos));
return ActionResult.SUCCESS;
return InteractionResult.SUCCESS;
}
return ActionResult.PASS;
return InteractionResult.PASS;
});
ClientTickEvents.END_CLIENT_TICK.register(client -> {
@@ -49,7 +47,7 @@ public class VideoPlayerClient implements ClientModInitializer {
updateDistanceGains(client);
});
ClientTickEvents.END_WORLD_TICK.register(world -> {
ClientTickEvents.END_LEVEL_TICK.register(world -> {
// no-op for now
});
@@ -57,19 +55,19 @@ public class VideoPlayerClient implements ClientModInitializer {
}
/** SPEC §6 — recompute per-anchor audio gain from player distance every tick. */
private static void updateDistanceGains(MinecraftClient client) {
ClientPlayerEntity p = client.player;
if (p == null || client.world == null) return;
Vec3d eye = p.getEyePos();
for (BlockPos pos : com.ejclaw.videoplayer.client.playback.VideoPlayback.activePositions()) {
if (!(client.world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) continue;
private static void updateDistanceGains(Minecraft client) {
LocalPlayer p = client.player;
if (p == null || client.level == null) return;
Vec3 eye = p.getEyePosition();
for (BlockPos pos : VideoPlayback.activePositions()) {
if (!(client.level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) continue;
double dx = (pos.getX() + 0.5) - eye.x;
double dy = (pos.getY() + 0.5) - eye.y;
double dz = (pos.getZ() + 0.5) - eye.z;
double d = Math.sqrt(dx * dx + dy * dy + dz * dz);
float attenuation = (float) Math.max(0.0, Math.min(1.0, 1.0 - d / 16.0));
float gain = be.isMuted() ? 0F : be.getVolume() * attenuation;
com.ejclaw.videoplayer.client.playback.VideoPlayback.setGain(pos, gain);
VideoPlayback.setGain(pos, gain);
}
}
}

View File

@@ -4,50 +4,49 @@ import com.ejclaw.videoplayer.item.VideoStickItem;
import com.ejclaw.videoplayer.net.OpenScreenPayload;
import com.mojang.serialization.MapCodec;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.BaseEntityBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
public class VideoAnchorBlock extends BlockWithEntity implements BlockEntityProvider {
public static final MapCodec<VideoAnchorBlock> CODEC = createCodec(VideoAnchorBlock::new);
public class VideoAnchorBlock extends BaseEntityBlock {
public static final MapCodec<VideoAnchorBlock> CODEC = simpleCodec(VideoAnchorBlock::new);
public VideoAnchorBlock(AbstractBlock.Settings settings) {
super(settings);
public VideoAnchorBlock(BlockBehaviour.Properties properties) {
super(properties);
}
@Override
protected MapCodec<? extends BlockWithEntity> getCodec() {
protected MapCodec<? extends BaseEntityBlock> codec() {
return CODEC;
}
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new VideoAnchorBlockEntity(pos, state);
}
@Override
protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world,
BlockPos pos, PlayerEntity player, Hand hand,
protected InteractionResult useItemOn(ItemStack stack, BlockState state, Level level,
BlockPos pos, Player player, InteractionHand hand,
BlockHitResult hit) {
if (!(stack.getItem() instanceof VideoStickItem)) {
return ActionResult.PASS;
return InteractionResult.PASS;
}
if (world.isClient) return ActionResult.SUCCESS;
if (!(player instanceof ServerPlayerEntity sp)) return ActionResult.PASS;
if (world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be) {
if (level.isClientSide()) return InteractionResult.SUCCESS;
if (!(player instanceof ServerPlayer sp)) return InteractionResult.PASS;
if (level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be) {
ServerPlayNetworking.send(sp, new OpenScreenPayload(pos, be.toNbt()));
return ActionResult.SUCCESS;
return InteractionResult.SUCCESS;
}
return ActionResult.PASS;
return InteractionResult.PASS;
}
}

View File

@@ -1,17 +1,18 @@
package com.ejclaw.videoplayer.block;
import com.ejclaw.videoplayer.registry.VideoPlayerBlockEntities;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.storage.ReadView;
import net.minecraft.storage.WriteView;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
/**
* Anchor BE — holds the per-block config that drives playback. NBT persistence uses
* 1.21.6's ReadView/WriteView. Network sync uses {@link #toNbt()} / {@link #fromNbt(NbtCompound)}.
* Anchor BE — holds per-block config that drives playback.
* NBT persistence uses 26.1's ValueInput/ValueOutput.
* Network sync uses {@link #toNbt()} / {@link #fromNbt(CompoundTag)}.
*/
public class VideoAnchorBlockEntity extends BlockEntity {
private String url = "";
@@ -36,28 +37,28 @@ public class VideoAnchorBlockEntity extends BlockEntity {
public boolean isMuted() { return muted; }
public boolean isAutoplay() { return autoplay; }
public void setUrl(String url) { this.url = url == null ? "" : url; markDirty(); }
public void setWidth(int width) { this.width = clamp(width, 1, 32); markDirty(); }
public void setHeight(int height) { this.height = clamp(height, 1, 32); markDirty(); }
public void setFacing(Direction facing) { this.facing = facing == null ? Direction.NORTH : facing; markDirty(); }
public void setLoop(boolean loop) { this.loop = loop; markDirty(); }
public void setVolume(float volume) { this.volume = Math.max(0F, Math.min(1F, volume)); markDirty(); }
public void setMuted(boolean muted) { this.muted = muted; markDirty(); }
public void setAutoplay(boolean autoplay) { this.autoplay = autoplay; markDirty(); }
public void setUrl(String url) { this.url = url == null ? "" : url; setChanged(); }
public void setWidth(int width) { this.width = clamp(width, 1, 32); setChanged(); }
public void setHeight(int height) { this.height = clamp(height, 1, 32); setChanged(); }
public void setFacing(Direction facing) { this.facing = facing == null ? Direction.NORTH : facing; setChanged(); }
public void setLoop(boolean loop) { this.loop = loop; setChanged(); }
public void setVolume(float volume) { this.volume = Math.max(0F, Math.min(1F, volume)); setChanged(); }
public void setMuted(boolean muted) { this.muted = muted; setChanged(); }
public void setAutoplay(boolean autoplay) { this.autoplay = autoplay; setChanged(); }
/** Apply server-validated config from an NBT (used by network handler). */
public void applyFromNbt(NbtCompound nbt) {
public void applyFromNbt(CompoundTag nbt) {
fromNbt(nbt);
markDirty();
setChanged();
}
/** Wire-format NBT used by SaveConfig/SyncAnchor payloads. */
public NbtCompound toNbt() {
NbtCompound nbt = new NbtCompound();
public CompoundTag toNbt() {
CompoundTag nbt = new CompoundTag();
nbt.putString("url", url);
nbt.putInt("width", width);
nbt.putInt("height", height);
nbt.putString("facing", facing.asString());
nbt.putString("facing", facing.getSerializedName());
nbt.putBoolean("loop", loop);
nbt.putFloat("volume", volume);
nbt.putBoolean("muted", muted);
@@ -65,43 +66,51 @@ public class VideoAnchorBlockEntity extends BlockEntity {
return nbt;
}
public void fromNbt(NbtCompound nbt) {
this.url = clampUrl(nbt.getString("url", ""));
this.width = clamp(nbt.getInt("width", 1), 1, 32);
this.height = clamp(nbt.getInt("height", 1), 1, 32);
Direction d = Direction.byId(nbt.getString("facing", "north"));
public void fromNbt(CompoundTag nbt) {
this.url = clampUrl(nbt.getStringOr("url", ""));
this.width = clamp(nbt.getIntOr("width", 1), 1, 32);
this.height = clamp(nbt.getIntOr("height", 1), 1, 32);
Direction d = directionFromName(nbt.getStringOr("facing", "north"));
this.facing = d == null ? Direction.NORTH : d;
this.loop = nbt.getBoolean("loop", true);
this.volume = Math.max(0F, Math.min(1F, nbt.getFloat("volume", 0.5F)));
this.muted = nbt.getBoolean("muted", false);
this.autoplay = nbt.getBoolean("autoplay", true);
this.loop = nbt.getBooleanOr("loop", true);
this.volume = Math.max(0F, Math.min(1F, nbt.getFloatOr("volume", 0.5F)));
this.muted = nbt.getBooleanOr("muted", false);
this.autoplay = nbt.getBooleanOr("autoplay", true);
}
@Override
protected void writeData(WriteView view) {
super.writeData(view);
view.putString("url", url);
view.putInt("width", width);
view.putInt("height", height);
view.putString("facing", facing.asString());
view.putBoolean("loop", loop);
view.putFloat("volume", volume);
view.putBoolean("muted", muted);
view.putBoolean("autoplay", autoplay);
protected void saveAdditional(ValueOutput out) {
super.saveAdditional(out);
out.putString("url", url);
out.putInt("width", width);
out.putInt("height", height);
out.putString("facing", facing.getSerializedName());
out.putBoolean("loop", loop);
out.putFloat("volume", volume);
out.putBoolean("muted", muted);
out.putBoolean("autoplay", autoplay);
}
@Override
protected void readData(ReadView view) {
super.readData(view);
this.url = clampUrl(view.getString("url", ""));
this.width = clamp(view.getInt("width", 1), 1, 32);
this.height = clamp(view.getInt("height", 1), 1, 32);
Direction d = Direction.byId(view.getString("facing", "north"));
protected void loadAdditional(ValueInput in) {
super.loadAdditional(in);
this.url = clampUrl(in.getStringOr("url", ""));
this.width = clamp(in.getIntOr("width", 1), 1, 32);
this.height = clamp(in.getIntOr("height", 1), 1, 32);
Direction d = directionFromName(in.getStringOr("facing", "north"));
this.facing = d == null ? Direction.NORTH : d;
this.loop = view.getBoolean("loop", true);
this.volume = Math.max(0F, Math.min(1F, view.getFloat("volume", 0.5F)));
this.muted = view.getBoolean("muted", false);
this.autoplay = view.getBoolean("autoplay", true);
this.loop = in.getBooleanOr("loop", true);
this.volume = Math.max(0F, Math.min(1F, in.getFloatOr("volume", 0.5F)));
this.muted = in.getBooleanOr("muted", false);
this.autoplay = in.getBooleanOr("autoplay", true);
}
private static Direction directionFromName(String name) {
if (name == null) return null;
for (Direction d : Direction.values()) {
if (d.getSerializedName().equalsIgnoreCase(name)) return d;
}
return null;
}
private static int clamp(int v, int lo, int hi) {

View File

@@ -5,33 +5,32 @@ import com.ejclaw.videoplayer.net.SaveConfigPayload;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.CheckboxWidget;
import net.minecraft.client.gui.widget.SliderWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.AbstractSliderButton;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.Checkbox;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
/** SPEC §4.3 — anchor config GUI. Opened by S2C {@code OpenScreenPayload}. */
@Environment(EnvType.CLIENT)
public class VideoConfigScreen extends Screen {
private final BlockPos pos;
private final NbtCompound initial;
private final CompoundTag initial;
private TextFieldWidget urlField;
private TextFieldWidget widthField;
private TextFieldWidget heightField;
private CheckboxWidget loopBox;
private CheckboxWidget muteBox;
private CheckboxWidget autoplayBox;
private EditBox urlField;
private EditBox widthField;
private EditBox heightField;
private Checkbox loopBox;
private Checkbox muteBox;
private Checkbox autoplayBox;
private VolumeSlider volumeSlider;
public VideoConfigScreen(BlockPos pos, NbtCompound data) {
super(Text.literal("Video Anchor"));
public VideoConfigScreen(BlockPos pos, CompoundTag data) {
super(Component.literal("Video Anchor"));
this.pos = pos;
this.initial = data;
}
@@ -41,81 +40,73 @@ public class VideoConfigScreen extends Screen {
int cx = this.width / 2;
int y = 40;
urlField = new TextFieldWidget(this.textRenderer, cx - 150, y, 300, 20, Text.literal("URL"));
urlField = new EditBox(this.font, cx - 150, y, 300, 20, Component.literal("URL"));
urlField.setMaxLength(256);
urlField.setText(initial.getString("url", ""));
addDrawableChild(urlField);
urlField.setValue(initial.getStringOr("url", ""));
addRenderableWidget(urlField);
y += 30;
widthField = new TextFieldWidget(this.textRenderer, cx - 150, y, 60, 20, Text.literal("W"));
widthField = new EditBox(this.font, cx - 150, y, 60, 20, Component.literal("W"));
widthField.setMaxLength(2);
widthField.setText(Integer.toString(initial.getInt("width", 1)));
widthField.setTextPredicate(VideoConfigScreen::isDigits);
addDrawableChild(widthField);
widthField.setValue(Integer.toString(initial.getIntOr("width", 1)));
addRenderableWidget(widthField);
heightField = new TextFieldWidget(this.textRenderer, cx - 80, y, 60, 20, Text.literal("H"));
heightField = new EditBox(this.font, cx - 80, y, 60, 20, Component.literal("H"));
heightField.setMaxLength(2);
heightField.setText(Integer.toString(initial.getInt("height", 1)));
heightField.setTextPredicate(VideoConfigScreen::isDigits);
addDrawableChild(heightField);
heightField.setValue(Integer.toString(initial.getIntOr("height", 1)));
addRenderableWidget(heightField);
volumeSlider = new VolumeSlider(cx - 10, y, 160, 20,
Math.max(0F, Math.min(1F, initial.getFloat("volume", 0.5F))));
addDrawableChild(volumeSlider);
Math.max(0F, Math.min(1F, initial.getFloatOr("volume", 0.5F))));
addRenderableWidget(volumeSlider);
y += 30;
loopBox = CheckboxWidget.builder(Text.literal("Loop"), this.textRenderer)
.pos(cx - 150, y).checked(initial.getBoolean("loop", true)).build();
addDrawableChild(loopBox);
loopBox = Checkbox.builder(Component.literal("Loop"), this.font)
.pos(cx - 150, y).selected(initial.getBooleanOr("loop", true)).build();
addRenderableWidget(loopBox);
muteBox = CheckboxWidget.builder(Text.literal("Mute"), this.textRenderer)
.pos(cx - 60, y).checked(initial.getBoolean("muted", false)).build();
addDrawableChild(muteBox);
muteBox = Checkbox.builder(Component.literal("Mute"), this.font)
.pos(cx - 60, y).selected(initial.getBooleanOr("muted", false)).build();
addRenderableWidget(muteBox);
autoplayBox = CheckboxWidget.builder(Text.literal("Autoplay"), this.textRenderer)
.pos(cx + 30, y).checked(initial.getBoolean("autoplay", true)).build();
addDrawableChild(autoplayBox);
autoplayBox = Checkbox.builder(Component.literal("Autoplay"), this.font)
.pos(cx + 30, y).selected(initial.getBooleanOr("autoplay", true)).build();
addRenderableWidget(autoplayBox);
y += 36;
addDrawableChild(ButtonWidget.builder(Text.literal("Save"), b -> save())
.dimensions(cx - 150, y, 90, 20).build());
addDrawableChild(ButtonWidget.builder(Text.literal("Cancel"), b -> close())
.dimensions(cx - 45, y, 90, 20).build());
addDrawableChild(ButtonWidget.builder(Text.literal("Delete"), b -> delete())
.dimensions(cx + 60, y, 90, 20).build());
addRenderableWidget(Button.builder(Component.literal("Save"), b -> save())
.bounds(cx - 150, y, 90, 20).build());
addRenderableWidget(Button.builder(Component.literal("Cancel"), b -> onClose())
.bounds(cx - 45, y, 90, 20).build());
addRenderableWidget(Button.builder(Component.literal("Delete"), b -> delete())
.bounds(cx + 60, y, 90, 20).build());
}
private void save() {
NbtCompound out = new NbtCompound();
out.putString("url", urlField.getText());
out.putInt("width", parseInt(widthField.getText(), 1));
out.putInt("height", parseInt(heightField.getText(), 1));
out.putString("facing", initial.getString("facing", "north"));
out.putBoolean("loop", loopBox.isChecked());
CompoundTag out = new CompoundTag();
out.putString("url", urlField.getValue());
out.putInt("width", parseInt(widthField.getValue(), 1));
out.putInt("height", parseInt(heightField.getValue(), 1));
out.putString("facing", initial.getStringOr("facing", "north"));
out.putBoolean("loop", loopBox.selected());
out.putFloat("volume", volumeSlider.getVolume());
out.putBoolean("muted", muteBox.isChecked());
out.putBoolean("autoplay", autoplayBox.isChecked());
out.putBoolean("muted", muteBox.selected());
out.putBoolean("autoplay", autoplayBox.selected());
ClientPlayNetworking.send(new SaveConfigPayload(pos, out));
close();
onClose();
}
private void delete() {
ClientPlayNetworking.send(new DeleteAnchorPayload(pos));
close();
onClose();
}
@Override
public void render(DrawContext ctx, int mouseX, int mouseY, float delta) {
super.render(ctx, mouseX, mouseY, delta);
ctx.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 16, 0xFFFFFF);
}
public boolean isPauseScreen() { return false; }
@Override
public boolean shouldPause() { return false; }
@Override
public void close() {
MinecraftClient mc = this.client != null ? this.client : MinecraftClient.getInstance();
public void onClose() {
Minecraft mc = this.minecraft != null ? this.minecraft : Minecraft.getInstance();
if (mc != null) mc.setScreen(null);
}
@@ -123,15 +114,9 @@ public class VideoConfigScreen extends Screen {
try { return Integer.parseInt(s); } catch (Exception e) { return dflt; }
}
private static boolean isDigits(String s) {
if (s.isEmpty()) return true;
for (int i = 0; i < s.length(); i++) if (!Character.isDigit(s.charAt(i))) return false;
return true;
}
private static final class VolumeSlider extends SliderWidget {
private static final class VolumeSlider extends AbstractSliderButton {
VolumeSlider(int x, int y, int w, int h, float initial) {
super(x, y, w, h, Text.literal("Volume: " + pct(initial)), initial);
super(x, y, w, h, Component.literal("Volume: " + pct(initial)), initial);
updateMessage();
}
@@ -139,7 +124,7 @@ public class VideoConfigScreen extends Screen {
@Override
protected void updateMessage() {
setMessage(Text.literal("Volume: " + pct((float) this.value)));
setMessage(Component.literal("Volume: " + pct((float) this.value)));
}
@Override

View File

@@ -8,7 +8,7 @@ import com.ejclaw.videoplayer.net.SyncAnchorPayload;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.Minecraft;
/** Client-side S2C receivers for OpenScreen and SyncAnchor. */
@Environment(EnvType.CLIENT)
@@ -16,16 +16,16 @@ public final class ClientNetworking {
private ClientNetworking() {}
public static void register() {
ClientPlayNetworking.registerGlobalReceiver(OpenScreenPayload.ID, (payload, context) -> {
MinecraftClient mc = context.client();
ClientPlayNetworking.registerGlobalReceiver(OpenScreenPayload.TYPE, (payload, context) -> {
Minecraft mc = context.client();
mc.execute(() -> mc.setScreen(new VideoConfigScreen(payload.pos(), payload.data())));
});
ClientPlayNetworking.registerGlobalReceiver(SyncAnchorPayload.ID, (payload, context) -> {
MinecraftClient mc = context.client();
ClientPlayNetworking.registerGlobalReceiver(SyncAnchorPayload.TYPE, (payload, context) -> {
Minecraft mc = context.client();
mc.execute(() -> {
if (mc.world == null) return;
if (mc.world.getBlockEntity(payload.pos()) instanceof VideoAnchorBlockEntity be) {
if (mc.level == null) return;
if (mc.level.getBlockEntity(payload.pos()) instanceof VideoAnchorBlockEntity be) {
be.applyFromNbt(payload.data());
VideoPlayback.onConfigChanged(be);
}

View File

@@ -1,45 +1,66 @@
package com.ejclaw.videoplayer.client.playback;
import com.ejclaw.videoplayer.VideoPlayerMod;
import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import com.mojang.blaze3d.platform.NativeImage;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.texture.NativeImage;
import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.Identifier;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
* SPEC §5 — per-anchor playback registry. Maps {@link BlockPos} → ({@link VideoBackend} + dynamic
* Identifier of an {@link NativeImageBackedTexture}). The renderer reads the texture id and binds
* it to the quad; this class drives the frame pump every client tick.
* SPEC §5 — per-anchor playback registry. Maps {@link BlockPos} → ({@link VideoBackend} +
* a {@link DynamicTexture} surface registered under a unique {@link Identifier}). The renderer
* reads {@link #currentTexture(BlockPos)} and binds it to the quad. {@link #tick()} pumps
* decoded RGBA frames into the texture.
*
* <p>When no backend is available on the classpath (e.g. JavaCV jar not installed by the
* user), the texture stays at its initial placeholder pattern, so the anchor's screen quad
* still renders as a visible surface.
*/
@Environment(EnvType.CLIENT)
public final class VideoPlayback {
private VideoPlayback() {}
private static final int PLACEHOLDER_SIZE = 32;
private static final Map<BlockPos, Entry> ENTRIES = new HashMap<>();
/**
* Ensure a playback entry exists for this anchor and return its texture identifier.
* Creates a backend + dynamic texture on first call. Returns {@code null} only if the
* URL is empty or autoplay is off.
*/
public static Identifier getOrStart(VideoAnchorBlockEntity be) {
BlockPos pos = be.getPos();
BlockPos pos = be.getBlockPos();
Entry e = ENTRIES.get(pos);
if (be.getUrl().isEmpty() || !be.isAutoplay()) {
if (e != null) {
stop(pos);
}
return null;
}
if (e != null && e.url.equals(be.getUrl())) {
return e.id;
}
if (e != null) {
stop(pos);
}
if (be.getUrl().isEmpty() || !be.isAutoplay()) {
return null;
}
VideoBackend backend = WatermediaProbe.isAvailable() ? new WatermediaBackend() : new JavaCvBackend();
backend.play(be.getUrl(), be.isLoop());
backend.setVolume(be.isMuted() ? 0F : be.getVolume());
Entry created = new Entry(be.getUrl(), backend);
ENTRIES.put(pos, created);
return created.id;
@@ -56,10 +77,11 @@ public final class VideoPlayback {
}
public static void onConfigChanged(VideoAnchorBlockEntity be) {
Entry e = ENTRIES.get(be.getPos());
if (be == null) return;
Entry e = ENTRIES.get(be.getBlockPos());
if (e == null) return;
if (!e.url.equals(be.getUrl())) {
stop(be.getPos());
stop(be.getBlockPos());
return;
}
e.backend.setVolume(be.isMuted() ? 0F : be.getVolume());
@@ -67,7 +89,7 @@ public final class VideoPlayback {
/** Called every client tick to upload new frames into the GPU texture. */
public static void tick() {
if (MinecraftClient.getInstance() == null) return;
if (Minecraft.getInstance() == null) return;
Iterator<Map.Entry<BlockPos, Entry>> it = ENTRIES.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<BlockPos, Entry> me = it.next();
@@ -78,15 +100,15 @@ public final class VideoPlayback {
try {
e.upload(buf);
} catch (Throwable t) {
// texture upload errors shouldn't kill the client; drop this entry
VideoPlayerMod.LOG.warn("[{}] texture upload failed: {}", VideoPlayerMod.MOD_ID, t.toString());
e.close();
it.remove();
}
}
}
public static java.util.Set<BlockPos> activePositions() {
return new java.util.HashSet<>(ENTRIES.keySet());
public static Set<BlockPos> activePositions() {
return new HashSet<>(ENTRIES.keySet());
}
public static void setGain(BlockPos pos, float gain) {
@@ -99,51 +121,83 @@ public final class VideoPlayback {
ENTRIES.clear();
}
/** Per-anchor playback state. */
private static final class Entry {
final String url;
final VideoBackend backend;
final Identifier id;
NativeImageBackedTexture texture;
DynamicTexture texture;
int texW = 0, texH = 0;
boolean registered = false;
Entry(String url, VideoBackend backend) {
this.url = url;
this.backend = backend;
this.id = Identifier.of("video_player", "dynamic/" + Integer.toHexString(System.identityHashCode(this)));
String tag = Integer.toHexString(System.identityHashCode(this));
this.id = Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "dynamic/" + tag);
ensureTexture(PLACEHOLDER_SIZE, PLACEHOLDER_SIZE, true);
}
/** Allocate or resize the dynamic texture, registering it on first allocation. */
private void ensureTexture(int w, int h, boolean fillPlaceholder) {
if (texture != null && w == texW && h == texH) return;
if (texture != null) texture.close();
NativeImage img = new NativeImage(w, h, false);
if (fillPlaceholder) {
fillPlaceholder(img, w, h);
}
texture = new DynamicTexture(() -> "video_player:" + id, img);
texW = w;
texH = h;
Minecraft mc = Minecraft.getInstance();
if (mc != null) {
mc.getTextureManager().register(id, texture);
registered = true;
}
texture.upload();
}
/** Dark gray surface with a thin border — visible "screen" until first frame arrives. */
private static void fillPlaceholder(NativeImage img, int w, int h) {
// ABGR int. 0xAABBGGRR.
int body = 0xFF202020; // dark gray
int border = 0xFF505050;
for (int y = 0; y < h; y++) {
for (int x = 0; x < w; x++) {
boolean isEdge = (x == 0 || y == 0 || x == w - 1 || y == h - 1);
img.setPixelABGR(x, y, isEdge ? border : body);
}
}
}
/** Copy an incoming RGBA byte buffer into the texture, resizing if dimensions changed. */
void upload(ByteBuffer rgba) {
int w = backend.videoWidth();
int h = backend.videoHeight();
if (w <= 0 || h <= 0) return;
if (texture == null || w != texW || h != texH) {
if (texture != null) texture.close();
NativeImage img = new NativeImage(NativeImage.Format.RGBA, w, h, false);
texture = new NativeImageBackedTexture(() -> "video_player_dyn", img);
MinecraftClient.getInstance().getTextureManager().registerTexture(id, texture);
texW = w; texH = h;
}
NativeImage img = texture.getImage();
ensureTexture(w, h, false);
NativeImage img = texture.getPixels();
if (img == null) return;
// copy buf → image pixels (RGBA bytes, native order)
int pixels = w * h;
for (int i = 0; i < pixels; i++) {
int r = rgba.get() & 0xFF;
int g = rgba.get() & 0xFF;
int b = rgba.get() & 0xFF;
int a = rgba.get() & 0xFF;
int argb = (a << 24) | (r << 16) | (g << 8) | b;
img.setColorArgb(i % w, i / w, argb);
int abgr = (a << 24) | (b << 16) | (g << 8) | r;
img.setPixelABGR(i % w, i / w, abgr);
}
texture.upload();
}
void close() {
backend.close();
try { backend.close(); } catch (Throwable ignored) {}
if (texture != null) {
texture.close();
try { texture.close(); } catch (Throwable ignored) {}
texture = null;
}
// texture manager keeps the registration; the texture itself is closed.
}
}
}

View File

@@ -1,91 +1,115 @@
package com.ejclaw.videoplayer.client.render;
import com.ejclaw.videoplayer.VideoPlayerMod;
import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import com.ejclaw.videoplayer.client.playback.VideoPlayback;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.RotationAxis;
import net.minecraft.util.math.Vec3d;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
import net.minecraft.client.renderer.rendertype.RenderType;
import net.minecraft.client.renderer.rendertype.RenderTypes;
import net.minecraft.client.renderer.state.level.CameraRenderState;
import net.minecraft.core.Direction;
import net.minecraft.resources.Identifier;
import net.minecraft.world.phys.Vec3;
import org.joml.Matrix4f;
/** SPEC §5.2 — draws a width × height quad in front of the anchor, oriented by facing. */
/**
* SPEC §5.2 — submits a width×height textured quad in front of the anchor, oriented by facing.
*
* <p>Ported to 26.1.2's render-state pipeline: per-frame BE state is captured in
* {@link State} via {@link #extractRenderState}, then drawn via
* {@link SubmitNodeCollector#submitCustomGeometry} during {@link #submit}.
*/
@Environment(EnvType.CLIENT)
public class VideoAnchorRenderer implements BlockEntityRenderer<VideoAnchorBlockEntity> {
public class VideoAnchorRenderer implements BlockEntityRenderer<VideoAnchorBlockEntity, VideoAnchorRenderer.State> {
/** Placeholder texture used until a frame is uploaded. */
private static final Identifier PLACEHOLDER =
Identifier.of(VideoPlayerMod.MOD_ID, "block/video_anchor");
public VideoAnchorRenderer(BlockEntityRendererFactory.Context ctx) {
// no-op — context kept for future symbol/lookup needs
public VideoAnchorRenderer(BlockEntityRendererProvider.Context ctx) {
// no-op
}
@Override
public void render(VideoAnchorBlockEntity be, float tickDelta, MatrixStack matrices,
VertexConsumerProvider vertices, int light, int overlay, Vec3d cam) {
Identifier tex = VideoPlayback.currentTexture(be.getPos());
Identifier bound = tex != null ? tex : PLACEHOLDER;
public State createRenderState() {
return new State();
}
float w = be.getWidth();
float h = be.getHeight();
@Override
public void extractRenderState(VideoAnchorBlockEntity be, State state, float partialTick,
Vec3 cameraPos, ModelFeatureRenderer.CrumblingOverlay crumbling) {
BlockEntityRenderState.extractBase(be, state, crumbling);
state.width = be.getWidth();
state.height = be.getHeight();
Direction facing = be.getFacing();
matrices.push();
// Center the quad above the anchor's top face, then rotate to facing.
matrices.translate(0.5, 1.01, 0.5);
float rot = facing.getAxis().isHorizontal()
? Direction.getHorizontalDegreesOrThrow(facing)
: 0F;
matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(-rot));
matrices.translate(-w / 2.0F, 0, 0);
VertexConsumer vc = vertices.getBuffer(RenderLayer.getEntityCutoutNoCull(bound));
Matrix4f mat = matrices.peek().getPositionMatrix();
// Two-sided quad in the XY plane at z=0
emit(vc, mat, 0, 0, 0, 0, 1, light, overlay);
emit(vc, mat, w, 0, 0, 1, 1, light, overlay);
emit(vc, mat, w, h, 0, 1, 0, light, overlay);
emit(vc, mat, 0, h, 0, 0, 0, light, overlay);
// back face (so the anchor is visible from behind too)
emit(vc, mat, 0, h, 0, 0, 0, light, overlay);
emit(vc, mat, w, h, 0, 1, 0, light, overlay);
emit(vc, mat, w, 0, 0, 1, 1, light, overlay);
emit(vc, mat, 0, 0, 0, 0, 1, light, overlay);
matrices.pop();
// Trigger playback startup lazily, on first frame the camera sees the BE.
VideoPlayback.getOrStart(be);
}
private static void emit(VertexConsumer vc, Matrix4f mat,
float x, float y, float z, float u, float v,
int light, int overlay) {
vc.vertex(mat, x, y, z)
.color(255, 255, 255, 255)
.texture(u, v)
.overlay(overlay)
.light(light)
.normal(0F, 0F, 1F);
state.yaw = facing.getAxis().isHorizontal() ? facing.toYRot() : 0F;
state.textureId = VideoPlayback.getOrStart(be);
}
@Override
public boolean rendersOutsideBoundingBox() {
public void submit(State state, PoseStack pose, SubmitNodeCollector collector, CameraRenderState camera) {
Identifier tex = state.textureId;
if (tex == null) return; // url empty or autoplay off — nothing to draw
final float w = state.width;
final float h = state.height;
final int light = state.lightCoords;
pose.pushPose();
// Center quad on the anchor's top face, rotated to face the configured direction.
pose.translate(0.5F, 1.01F, 0.5F);
pose.mulPose(Axis.YP.rotationDegrees(-state.yaw));
pose.translate(-w / 2.0F, 0F, 0F);
// Snapshot the matrix so the callback's matrix-aware addVertex works even though
// submitCustomGeometry hands us a fresh Pose (its `pose` parameter).
final Matrix4f mat = new Matrix4f(pose.last().pose());
RenderType rt = RenderTypes.entityCutout(tex);
collector.submitCustomGeometry(pose, rt, (poseUnused, vc) -> {
// Front face (visible from the direction the anchor faces)
emit(vc, mat, 0F, 0F, 0F, 0F, 1F, light);
emit(vc, mat, w, 0F, 0F, 1F, 1F, light);
emit(vc, mat, w, h, 0F, 1F, 0F, light);
emit(vc, mat, 0F, h, 0F, 0F, 0F, light);
// Back face (visible from behind)
emit(vc, mat, 0F, h, 0F, 0F, 0F, light);
emit(vc, mat, w, h, 0F, 1F, 0F, light);
emit(vc, mat, w, 0F, 0F, 1F, 1F, light);
emit(vc, mat, 0F, 0F, 0F, 0F, 1F, light);
});
pose.popPose();
}
private static void emit(com.mojang.blaze3d.vertex.VertexConsumer vc, Matrix4f mat,
float x, float y, float z, float u, float v, int light) {
vc.addVertex(mat, x, y, z)
.setColor(255, 255, 255, 255)
.setUv(u, v)
.setOverlay(net.minecraft.client.renderer.texture.OverlayTexture.NO_OVERLAY)
.setLight(light)
.setNormal(0F, 0F, 1F);
}
@Override
public boolean shouldRenderOffScreen() {
return true;
}
@Override
public int getRenderDistance() {
public int getViewDistance() {
return 128;
}
/** Per-frame render data extracted from the BE. */
public static final class State extends BlockEntityRenderState {
public Identifier textureId;
public int width = 1;
public int height = 1;
public float yaw = 0F;
}
}

View File

@@ -3,42 +3,44 @@ package com.ejclaw.videoplayer.command;
import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.block.Blocks;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.permissions.Permissions;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
/** SPEC §4.5.1 — {@code /videoDelete <pos>} */
public final class VideoDeleteCommand {
private VideoDeleteCommand() {}
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
dispatcher.register(register("videoDelete"));
dispatcher.register(register("videodelete"));
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
dispatcher.register(build("videoDelete"));
dispatcher.register(build("videodelete"));
}
private static com.mojang.brigadier.builder.LiteralArgumentBuilder<ServerCommandSource>
register(String name) {
return CommandManager.literal(name)
.requires(s -> s.hasPermissionLevel(2))
.then(CommandManager.argument("pos", BlockPosArgumentType.blockPos())
private static com.mojang.brigadier.builder.LiteralArgumentBuilder<CommandSourceStack>
build(String name) {
return Commands.literal(name)
.requires(s -> s.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
.then(Commands.argument("pos", BlockPosArgument.blockPos())
.executes(VideoDeleteCommand::run));
}
private static int run(com.mojang.brigadier.context.CommandContext<ServerCommandSource> ctx)
private static int run(com.mojang.brigadier.context.CommandContext<CommandSourceStack> ctx)
throws CommandSyntaxException {
ServerCommandSource src = ctx.getSource();
ServerWorld world = src.getWorld();
BlockPos pos = BlockPosArgumentType.getLoadedBlockPos(ctx, "pos");
if (!(world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity)) {
src.sendError(Text.literal("no anchor at that position"));
CommandSourceStack src = ctx.getSource();
ServerLevel level = src.getLevel();
BlockPos pos = BlockPosArgument.getLoadedBlockPos(ctx, "pos");
if (!(level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity)) {
src.sendFailure(Component.literal("no anchor at that position"));
return 0;
}
world.setBlockState(pos, Blocks.AIR.getDefaultState());
src.sendFeedback(() -> Text.literal("anchor deleted at " + pos.toShortString()), true);
level.setBlock(pos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL);
src.sendSuccess(() -> Component.literal("anchor deleted at " + pos.toShortString()), true);
return 1;
}
}

View File

@@ -7,55 +7,56 @@ import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.permissions.Permissions;
/** SPEC §4.5.1 — {@code /videoMute <pos> <on|off>} */
public final class VideoMuteCommand {
private VideoMuteCommand() {}
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
dispatcher.register(register("videoMute"));
dispatcher.register(register("videomute"));
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
dispatcher.register(build("videoMute"));
dispatcher.register(build("videomute"));
}
private static com.mojang.brigadier.builder.LiteralArgumentBuilder<ServerCommandSource>
register(String name) {
return CommandManager.literal(name)
.requires(s -> s.hasPermissionLevel(2))
.then(CommandManager.argument("pos", BlockPosArgumentType.blockPos())
.then(CommandManager.argument("state", StringArgumentType.word())
private static com.mojang.brigadier.builder.LiteralArgumentBuilder<CommandSourceStack>
build(String name) {
return Commands.literal(name)
.requires(s -> s.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
.then(Commands.argument("pos", BlockPosArgument.blockPos())
.then(Commands.argument("state", StringArgumentType.word())
.executes(VideoMuteCommand::run)));
}
private static int run(com.mojang.brigadier.context.CommandContext<ServerCommandSource> ctx)
private static int run(com.mojang.brigadier.context.CommandContext<CommandSourceStack> ctx)
throws CommandSyntaxException {
ServerCommandSource src = ctx.getSource();
ServerWorld world = src.getWorld();
BlockPos pos = BlockPosArgumentType.getLoadedBlockPos(ctx, "pos");
CommandSourceStack src = ctx.getSource();
ServerLevel level = src.getLevel();
BlockPos pos = BlockPosArgument.getLoadedBlockPos(ctx, "pos");
String state = StringArgumentType.getString(ctx, "state").toLowerCase();
boolean muted;
if ("on".equals(state) || "true".equals(state)) muted = true;
else if ("off".equals(state) || "false".equals(state)) muted = false;
else {
src.sendError(Text.literal("state must be on/off"));
src.sendFailure(Component.literal("state must be on/off"));
return 0;
}
if (!(world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) {
src.sendError(Text.literal("no anchor at that position"));
if (!(level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) {
src.sendFailure(Component.literal("no anchor at that position"));
return 0;
}
be.setMuted(muted);
for (ServerPlayerEntity p : PlayerLookup.tracking(world, pos)) {
for (ServerPlayer p : PlayerLookup.tracking(level, pos)) {
ServerPlayNetworking.send(p, new SyncAnchorPayload(pos, be.toNbt()));
}
final boolean mFinal = muted;
src.sendFeedback(() -> Text.literal("anchor " + (mFinal ? "muted" : "unmuted")), true);
src.sendSuccess(() -> Component.literal("anchor " + (mFinal ? "muted" : "unmuted")), true);
return 1;
}
}

View File

@@ -4,65 +4,66 @@ import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import com.ejclaw.videoplayer.net.SyncAnchorPayload;
import com.ejclaw.videoplayer.registry.VideoPlayerBlocks;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.FloatArgumentType;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.permissions.Permissions;
import net.minecraft.world.level.block.Block;
/** SPEC §4.5.1 — {@code /videoPlace <pos> <facing> <width> <height> <url>} */
public final class VideoPlaceCommand {
private VideoPlaceCommand() {}
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
dispatcher.register(register("videoPlace"));
dispatcher.register(register("videoplace"));
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
dispatcher.register(build("videoPlace"));
dispatcher.register(build("videoplace"));
}
private static com.mojang.brigadier.builder.LiteralArgumentBuilder<ServerCommandSource>
register(String name) {
return CommandManager.literal(name)
.requires(s -> s.hasPermissionLevel(2))
.then(CommandManager.argument("pos", BlockPosArgumentType.blockPos())
.then(CommandManager.argument("facing", StringArgumentType.word())
.then(CommandManager.argument("width", IntegerArgumentType.integer(1, 32))
.then(CommandManager.argument("height", IntegerArgumentType.integer(1, 32))
.then(CommandManager.argument("url", StringArgumentType.greedyString())
private static com.mojang.brigadier.builder.LiteralArgumentBuilder<CommandSourceStack>
build(String name) {
return Commands.literal(name)
.requires(s -> s.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
.then(Commands.argument("pos", BlockPosArgument.blockPos())
.then(Commands.argument("facing", StringArgumentType.word())
.then(Commands.argument("width", IntegerArgumentType.integer(1, 32))
.then(Commands.argument("height", IntegerArgumentType.integer(1, 32))
.then(Commands.argument("url", StringArgumentType.greedyString())
.executes(VideoPlaceCommand::run))))));
}
private static int run(com.mojang.brigadier.context.CommandContext<ServerCommandSource> ctx)
private static int run(com.mojang.brigadier.context.CommandContext<CommandSourceStack> ctx)
throws CommandSyntaxException {
ServerCommandSource src = ctx.getSource();
ServerWorld world = src.getWorld();
BlockPos pos = BlockPosArgumentType.getLoadedBlockPos(ctx, "pos");
Direction facing = Direction.byId(StringArgumentType.getString(ctx, "facing"));
CommandSourceStack src = ctx.getSource();
ServerLevel level = src.getLevel();
BlockPos pos = BlockPosArgument.getLoadedBlockPos(ctx, "pos");
Direction facing = directionFromName(StringArgumentType.getString(ctx, "facing"));
if (facing == null) {
src.sendError(Text.literal("facing must be north/south/east/west/up/down"));
src.sendFailure(Component.literal("facing must be north/south/east/west/up/down"));
return 0;
}
int width = IntegerArgumentType.getInteger(ctx, "width");
int height = IntegerArgumentType.getInteger(ctx, "height");
String url = StringArgumentType.getString(ctx, "url").trim();
if (!url.isEmpty() && !(url.startsWith("http://") || url.startsWith("https://"))) {
src.sendError(Text.literal("url must be http:// or https:// (or empty)"));
src.sendFailure(Component.literal("url must be http:// or https:// (or empty)"));
return 0;
}
if (url.length() > 256) url = url.substring(0, 256);
world.setBlockState(pos, VideoPlayerBlocks.VIDEO_ANCHOR.getDefaultState());
if (!(world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) {
src.sendError(Text.literal("failed to place anchor"));
level.setBlock(pos, VideoPlayerBlocks.VIDEO_ANCHOR.defaultBlockState(), Block.UPDATE_ALL);
if (!(level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) {
src.sendFailure(Component.literal("failed to place anchor"));
return 0;
}
be.setFacing(facing);
@@ -70,12 +71,20 @@ public final class VideoPlaceCommand {
be.setHeight(height);
be.setUrl(url);
NbtCompound nbt = be.toNbt();
for (ServerPlayerEntity p : PlayerLookup.tracking(world, pos)) {
CompoundTag nbt = be.toNbt();
for (ServerPlayer p : PlayerLookup.tracking(level, pos)) {
ServerPlayNetworking.send(p, new SyncAnchorPayload(pos, nbt));
}
final BlockPos fp = pos;
src.sendFeedback(() -> Text.literal("anchor placed at " + fp.toShortString()), true);
src.sendSuccess(() -> Component.literal("anchor placed at " + fp.toShortString()), true);
return 1;
}
private static Direction directionFromName(String name) {
if (name == null) return null;
for (Direction d : Direction.values()) {
if (d.getSerializedName().equalsIgnoreCase(name)) return d;
}
return null;
}
}

View File

@@ -2,35 +2,35 @@ package com.ejclaw.videoplayer.command;
import com.ejclaw.videoplayer.registry.VideoPlayerItems;
import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.item.ItemStack;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
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.world.item.ItemStack;
public final class VideoStickCommand {
private VideoStickCommand() {}
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
dispatcher.register(CommandManager.literal("videoStick")
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
dispatcher.register(Commands.literal("videoStick")
.executes(ctx -> run(ctx.getSource())));
// Lowercase alias — Brigadier is case-sensitive.
dispatcher.register(CommandManager.literal("videostick")
dispatcher.register(Commands.literal("videostick")
.executes(ctx -> run(ctx.getSource())));
}
private static int run(ServerCommandSource source) {
ServerPlayerEntity player = source.getPlayer();
private static int run(CommandSourceStack source) {
ServerPlayer player = source.getPlayer();
if (player == null) {
source.sendError(Text.literal("플레이어만 이 명령을 사용할 수 있습니다."));
source.sendFailure(Component.literal("플레이어만 이 명령을 사용할 수 있습니다."));
return 0;
}
ItemStack stack = new ItemStack(VideoPlayerItems.VIDEO_STICK);
boolean inserted = player.getInventory().insertStack(stack);
boolean inserted = player.getInventory().add(stack);
if (!inserted || !stack.isEmpty()) {
player.dropItem(stack, false);
player.drop(stack, false, false);
}
source.sendFeedback(() -> Text.literal("비디오 스틱을 지급했습니다."), false);
source.sendSuccess(() -> Component.literal("비디오 스틱을 지급했습니다."), false);
return 1;
}
}

View File

@@ -4,57 +4,55 @@ import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import com.ejclaw.videoplayer.net.OpenScreenPayload;
import com.ejclaw.videoplayer.registry.VideoPlayerBlocks;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
/** SPEC §4.2 — right-click empty face → place anchor + open GUI. Right-click existing anchor → edit. */
/** Right-click empty face → place anchor + open GUI. Right-click existing anchor → edit. */
public class VideoStickItem extends Item {
public VideoStickItem(Settings settings) {
super(settings);
public VideoStickItem(Properties properties) {
super(properties);
}
@Override
public ActionResult useOnBlock(ItemUsageContext ctx) {
World world = ctx.getWorld();
if (world.isClient) {
// server is authoritative; client just consumes the gesture
return ActionResult.SUCCESS;
public InteractionResult useOn(UseOnContext ctx) {
Level level = ctx.getLevel();
if (level.isClientSide()) {
return InteractionResult.SUCCESS;
}
if (!(level instanceof ServerLevel sl)) return InteractionResult.PASS;
Player player = ctx.getPlayer();
if (!(player instanceof ServerPlayer sp)) return InteractionResult.PASS;
ServerWorld sw = (ServerWorld) world;
PlayerEntity player = ctx.getPlayer();
if (!(player instanceof ServerPlayerEntity sp)) return ActionResult.PASS;
BlockPos hit = ctx.getBlockPos();
BlockPos hit = ctx.getClickedPos();
// Existing anchor → edit
if (sw.getBlockEntity(hit) instanceof VideoAnchorBlockEntity existing) {
if (sl.getBlockEntity(hit) instanceof VideoAnchorBlockEntity existing) {
ServerPlayNetworking.send(sp, new OpenScreenPayload(hit, existing.toNbt()));
return ActionResult.SUCCESS;
return InteractionResult.SUCCESS;
}
// Empty face → place anchor on top of the clicked face
Direction side = ctx.getSide();
BlockPos placeAt = hit.offset(side);
BlockState there = sw.getBlockState(placeAt);
if (!there.isReplaceable()) return ActionResult.PASS;
Direction side = ctx.getClickedFace();
BlockPos placeAt = hit.relative(side);
BlockState there = sl.getBlockState(placeAt);
if (!there.canBeReplaced()) return InteractionResult.PASS;
Block anchor = VideoPlayerBlocks.VIDEO_ANCHOR;
sw.setBlockState(placeAt, anchor.getDefaultState());
sl.setBlock(placeAt, anchor.defaultBlockState(), Block.UPDATE_ALL);
if (sw.getBlockEntity(placeAt) instanceof VideoAnchorBlockEntity be) {
be.setFacing(ctx.getHorizontalPlayerFacing().getOpposite());
if (sl.getBlockEntity(placeAt) instanceof VideoAnchorBlockEntity be) {
be.setFacing(ctx.getHorizontalDirection().getOpposite());
ServerPlayNetworking.send(sp, new OpenScreenPayload(placeAt, be.toNbt()));
}
return ActionResult.SUCCESS;
return InteractionResult.SUCCESS;
}
}

View File

@@ -1,24 +1,24 @@
package com.ejclaw.videoplayer.net;
import com.ejclaw.videoplayer.VideoPlayerMod;
import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.core.BlockPos;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.Identifier;
/** C2S — delete an anchor from the VideoConfigScreen. */
public record DeleteAnchorPayload(BlockPos pos) implements CustomPayload {
public static final CustomPayload.Id<DeleteAnchorPayload> ID =
new CustomPayload.Id<>(Identifier.of(VideoPlayerMod.MOD_ID, "delete_anchor"));
public record DeleteAnchorPayload(BlockPos pos) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<DeleteAnchorPayload> TYPE =
new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "delete_anchor"));
public static final PacketCodec<RegistryByteBuf, DeleteAnchorPayload> CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, DeleteAnchorPayload::pos,
public static final StreamCodec<RegistryFriendlyByteBuf, DeleteAnchorPayload> CODEC = StreamCodec.composite(
BlockPos.STREAM_CODEC, DeleteAnchorPayload::pos,
DeleteAnchorPayload::new
);
@Override
public Id<? extends CustomPayload> getId() {
return ID;
public Type<? extends CustomPacketPayload> type() {
return TYPE;
}
}

View File

@@ -1,27 +1,27 @@
package com.ejclaw.videoplayer.net;
import com.ejclaw.videoplayer.VideoPlayerMod;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
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;
/** S2C — open the VideoConfigScreen for an anchor on the client. */
public record OpenScreenPayload(BlockPos pos, NbtCompound data) implements CustomPayload {
public static final CustomPayload.Id<OpenScreenPayload> ID =
new CustomPayload.Id<>(Identifier.of(VideoPlayerMod.MOD_ID, "open_screen"));
public record OpenScreenPayload(BlockPos pos, CompoundTag data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<OpenScreenPayload> TYPE =
new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "open_screen"));
public static final PacketCodec<RegistryByteBuf, OpenScreenPayload> CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, OpenScreenPayload::pos,
PacketCodecs.NBT_COMPOUND, OpenScreenPayload::data,
public static final StreamCodec<RegistryFriendlyByteBuf, OpenScreenPayload> CODEC = StreamCodec.composite(
BlockPos.STREAM_CODEC, OpenScreenPayload::pos,
ByteBufCodecs.COMPOUND_TAG, OpenScreenPayload::data,
OpenScreenPayload::new
);
@Override
public Id<? extends CustomPayload> getId() {
return ID;
public Type<? extends CustomPacketPayload> type() {
return TYPE;
}
}

View File

@@ -1,27 +1,27 @@
package com.ejclaw.videoplayer.net;
import com.ejclaw.videoplayer.VideoPlayerMod;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
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 — save edited config from VideoConfigScreen back to the server. */
public record SaveConfigPayload(BlockPos pos, NbtCompound data) implements CustomPayload {
public static final CustomPayload.Id<SaveConfigPayload> ID =
new CustomPayload.Id<>(Identifier.of(VideoPlayerMod.MOD_ID, "save_config"));
public record SaveConfigPayload(BlockPos pos, CompoundTag data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<SaveConfigPayload> TYPE =
new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "save_config"));
public static final PacketCodec<RegistryByteBuf, SaveConfigPayload> CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, SaveConfigPayload::pos,
PacketCodecs.NBT_COMPOUND, SaveConfigPayload::data,
public static final StreamCodec<RegistryFriendlyByteBuf, SaveConfigPayload> CODEC = StreamCodec.composite(
BlockPos.STREAM_CODEC, SaveConfigPayload::pos,
ByteBufCodecs.COMPOUND_TAG, SaveConfigPayload::data,
SaveConfigPayload::new
);
@Override
public Id<? extends CustomPayload> getId() {
return ID;
public Type<? extends CustomPacketPayload> type() {
return TYPE;
}
}

View File

@@ -1,27 +1,27 @@
package com.ejclaw.videoplayer.net;
import com.ejclaw.videoplayer.VideoPlayerMod;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
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;
/** S2C — push current anchor state (URL/dims/loop/volume/muted/autoplay) to clients in range. */
public record SyncAnchorPayload(BlockPos pos, NbtCompound data) implements CustomPayload {
public static final CustomPayload.Id<SyncAnchorPayload> ID =
new CustomPayload.Id<>(Identifier.of(VideoPlayerMod.MOD_ID, "sync_anchor"));
/** S2C — push current anchor state to clients tracking the chunk. */
public record SyncAnchorPayload(BlockPos pos, CompoundTag data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<SyncAnchorPayload> TYPE =
new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "sync_anchor"));
public static final PacketCodec<RegistryByteBuf, SyncAnchorPayload> CODEC = PacketCodec.tuple(
BlockPos.PACKET_CODEC, SyncAnchorPayload::pos,
PacketCodecs.NBT_COMPOUND, SyncAnchorPayload::data,
public static final StreamCodec<RegistryFriendlyByteBuf, SyncAnchorPayload> CODEC = StreamCodec.composite(
BlockPos.STREAM_CODEC, SyncAnchorPayload::pos,
ByteBufCodecs.COMPOUND_TAG, SyncAnchorPayload::data,
SyncAnchorPayload::new
);
@Override
public Id<? extends CustomPayload> getId() {
return ID;
public Type<? extends CustomPacketPayload> type() {
return TYPE;
}
}

View File

@@ -5,11 +5,13 @@ import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.block.Blocks;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.permissions.Permissions;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
/**
* Registers all four payload types and the two C2S server-side receivers.
@@ -20,72 +22,73 @@ public final class VideoPlayerNetwork {
public static void registerPayloadTypes() {
// S2C
PayloadTypeRegistry.playS2C().register(OpenScreenPayload.ID, OpenScreenPayload.CODEC);
PayloadTypeRegistry.playS2C().register(SyncAnchorPayload.ID, SyncAnchorPayload.CODEC);
PayloadTypeRegistry.clientboundPlay().register(OpenScreenPayload.TYPE, OpenScreenPayload.CODEC);
PayloadTypeRegistry.clientboundPlay().register(SyncAnchorPayload.TYPE, SyncAnchorPayload.CODEC);
// C2S
PayloadTypeRegistry.playC2S().register(SaveConfigPayload.ID, SaveConfigPayload.CODEC);
PayloadTypeRegistry.playC2S().register(DeleteAnchorPayload.ID, DeleteAnchorPayload.CODEC);
PayloadTypeRegistry.serverboundPlay().register(SaveConfigPayload.TYPE, SaveConfigPayload.CODEC);
PayloadTypeRegistry.serverboundPlay().register(DeleteAnchorPayload.TYPE, DeleteAnchorPayload.CODEC);
}
public static void registerServerReceivers() {
ServerPlayNetworking.registerGlobalReceiver(SaveConfigPayload.ID, (payload, context) -> {
ServerPlayerEntity player = context.player();
ServerWorld world = player.getWorld();
ServerPlayNetworking.registerGlobalReceiver(SaveConfigPayload.TYPE, (payload, context) -> {
ServerPlayer player = context.player();
ServerLevel level = player.level();
BlockPos pos = payload.pos();
context.server().execute(() -> handleSave(world, player, pos, payload.data()));
CompoundTag data = payload.data();
context.server().execute(() -> handleSave(level, player, pos, data));
});
ServerPlayNetworking.registerGlobalReceiver(DeleteAnchorPayload.ID, (payload, context) -> {
ServerPlayerEntity player = context.player();
ServerWorld world = player.getWorld();
ServerPlayNetworking.registerGlobalReceiver(DeleteAnchorPayload.TYPE, (payload, context) -> {
ServerPlayer player = context.player();
ServerLevel level = player.level();
BlockPos pos = payload.pos();
context.server().execute(() -> handleDelete(world, player, pos));
context.server().execute(() -> handleDelete(level, player, pos));
});
}
private static void handleSave(ServerWorld world, ServerPlayerEntity player, BlockPos pos, NbtCompound data) {
private static void handleSave(ServerLevel level, ServerPlayer player, BlockPos pos, CompoundTag data) {
if (!canModify(player, pos)) {
VideoPlayerMod.LOG.warn("[{}] {} attempted save without permission at {}",
VideoPlayerMod.MOD_ID, player.getName().getString(), pos);
return;
}
if (!(world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) {
if (!(level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity be)) {
return;
}
be.applyFromNbt(sanitize(data));
// broadcast updated state to all players tracking the chunk
SyncAnchorPayload sync = new SyncAnchorPayload(pos, be.toNbt());
for (ServerPlayerEntity watcher : PlayerLookup.tracking(world, pos)) {
for (ServerPlayer watcher : PlayerLookup.tracking(level, pos)) {
ServerPlayNetworking.send(watcher, sync);
}
}
private static void handleDelete(ServerWorld world, ServerPlayerEntity player, BlockPos pos) {
private static void handleDelete(ServerLevel level, ServerPlayer player, BlockPos pos) {
if (!canModify(player, pos)) {
return;
}
if (world.getBlockEntity(pos) instanceof VideoAnchorBlockEntity) {
world.setBlockState(pos, Blocks.AIR.getDefaultState());
if (level.getBlockEntity(pos) instanceof VideoAnchorBlockEntity) {
level.setBlock(pos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL);
}
}
/** Permission check: creative players or operators may modify anchors. */
public static boolean canModify(ServerPlayerEntity player, BlockPos pos) {
public static boolean canModify(ServerPlayer player, BlockPos pos) {
if (player.isCreative()) return true;
return player.hasPermissionLevel(2);
return player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER);
}
/** Strip out unexpected keys from C2S NBT before applying. */
private static NbtCompound sanitize(NbtCompound in) {
NbtCompound out = new NbtCompound();
out.putString("url", trimUrl(in.getString("url", "")));
out.putInt("width", clamp(in.getInt("width", 1), 1, 32));
out.putInt("height", clamp(in.getInt("height", 1), 1, 32));
out.putString("facing", in.getString("facing", "north"));
out.putBoolean("loop", in.getBoolean("loop", true));
out.putFloat("volume", Math.max(0F, Math.min(1F, in.getFloat("volume", 0.5F))));
out.putBoolean("muted", in.getBoolean("muted", false));
out.putBoolean("autoplay", in.getBoolean("autoplay", true));
private static CompoundTag sanitize(CompoundTag in) {
CompoundTag out = new CompoundTag();
out.putString("url", trimUrl(in.getStringOr("url", "")));
out.putInt("width", clamp(in.getIntOr("width", 1), 1, 32));
out.putInt("height", clamp(in.getIntOr("height", 1), 1, 32));
out.putString("facing", in.getStringOr("facing", "north"));
out.putBoolean("loop", in.getBooleanOr("loop", true));
out.putFloat("volume", Math.max(0F, Math.min(1F, in.getFloatOr("volume", 0.5F))));
out.putBoolean("muted", in.getBooleanOr("muted", false));
out.putBoolean("autoplay", in.getBooleanOr("autoplay", true));
return out;
}

View File

@@ -3,17 +3,17 @@ package com.ejclaw.videoplayer.registry;
import com.ejclaw.videoplayer.VideoPlayerMod;
import com.ejclaw.videoplayer.block.VideoAnchorBlockEntity;
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.Registry;
import net.minecraft.resources.Identifier;
import net.minecraft.world.level.block.entity.BlockEntityType;
public final class VideoPlayerBlockEntities {
private VideoPlayerBlockEntities() {}
public static final BlockEntityType<VideoAnchorBlockEntity> VIDEO_ANCHOR = Registry.register(
Registries.BLOCK_ENTITY_TYPE,
Identifier.of(VideoPlayerMod.MOD_ID, "video_anchor"),
BuiltInRegistries.BLOCK_ENTITY_TYPE,
Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, "video_anchor"),
FabricBlockEntityTypeBuilder.create(VideoAnchorBlockEntity::new, VideoPlayerBlocks.VIDEO_ANCHOR).build()
);

View File

@@ -2,20 +2,19 @@ package com.ejclaw.videoplayer.registry;
import com.ejclaw.videoplayer.VideoPlayerMod;
import com.ejclaw.videoplayer.block.VideoAnchorBlock;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.util.Identifier;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.Registry;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
public final class VideoPlayerBlocks {
private VideoPlayerBlocks() {}
public static final Block VIDEO_ANCHOR = register(
"video_anchor",
AbstractBlock.Settings.create().strength(1.0F).nonOpaque(),
BlockBehaviour.Properties.of().strength(1.0F).noOcclusion(),
VideoAnchorBlock::new
);
@@ -25,13 +24,13 @@ public final class VideoPlayerBlocks {
@FunctionalInterface
private interface BlockFactory<B extends Block> {
B create(AbstractBlock.Settings settings);
B create(BlockBehaviour.Properties properties);
}
private static <B extends Block> B register(String name, AbstractBlock.Settings settings, BlockFactory<B> factory) {
Identifier id = Identifier.of(VideoPlayerMod.MOD_ID, name);
RegistryKey<Block> key = RegistryKey.of(RegistryKeys.BLOCK, id);
B block = factory.create(settings.registryKey(key));
return Registry.register(Registries.BLOCK, key, block);
private static <B extends Block> B register(String name, BlockBehaviour.Properties props, BlockFactory<B> factory) {
Identifier id = Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, name);
ResourceKey<Block> key = ResourceKey.create(BuiltInRegistries.BLOCK.key(), id);
B block = factory.create(props.setId(key));
return Registry.register(BuiltInRegistries.BLOCK, key, block);
}
}

View File

@@ -2,34 +2,33 @@ package com.ejclaw.videoplayer.registry;
import com.ejclaw.videoplayer.VideoPlayerMod;
import com.ejclaw.videoplayer.item.VideoStickItem;
import net.minecraft.item.Item;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.util.Identifier;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.Registry;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.item.Item;
public final class VideoPlayerItems {
private VideoPlayerItems() {}
public static final Item VIDEO_STICK = register(
"video_stick",
settings -> new VideoStickItem(settings.maxCount(1))
props -> new VideoStickItem(props.stacksTo(1))
);
public static void register() {
// For M1 we don't add to a vanilla item group; players get the stick via /videoStick.
// players get the stick via /videoStick command
}
@FunctionalInterface
private interface ItemFactory<I extends Item> {
I create(Item.Settings settings);
I create(Item.Properties properties);
}
private static <I extends Item> I register(String name, ItemFactory<I> factory) {
Identifier id = Identifier.of(VideoPlayerMod.MOD_ID, name);
RegistryKey<Item> key = RegistryKey.of(RegistryKeys.ITEM, id);
I item = factory.create(new Item.Settings().registryKey(key));
return Registry.register(Registries.ITEM, key, item);
Identifier id = Identifier.fromNamespaceAndPath(VideoPlayerMod.MOD_ID, name);
ResourceKey<Item> key = ResourceKey.create(BuiltInRegistries.ITEM.key(), id);
I item = factory.create(new Item.Properties().setId(key));
return Registry.register(BuiltInRegistries.ITEM, key, item);
}
}

View File

@@ -16,9 +16,9 @@
"client": [ "com.ejclaw.videoplayer.VideoPlayerClient" ]
},
"depends": {
"fabricloader": ">=0.16.0",
"fabricloader": ">=0.19.0",
"fabric-api": "*",
"minecraft": "${target_minecraft}",
"java": ">=21"
"java": ">=25"
}
}