v0.4.25: add volume argument to /videoPlace, -1 mutes
Some checks failed
build / build (push) Has been cancelled
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.
This commit is contained in:
@@ -5,7 +5,7 @@ org.gradle.configuration-cache=false
|
|||||||
|
|
||||||
# Mod
|
# Mod
|
||||||
mod_id=video_player
|
mod_id=video_player
|
||||||
mod_version=0.4.24
|
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
|
||||||
|
|
||||||
|
|||||||
@@ -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("volume", IntegerArgumentType.integer(-1, 100))
|
||||||
.then(Commands.argument("url", StringArgumentType.greedyString())
|
.then(Commands.argument("url", StringArgumentType.greedyString())
|
||||||
.executes(VideoPlaceCommand::run))))));
|
.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)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user