Add /nightvision toggle and keep portable workstation menus open (1.3.0)

- New /nightvision (/nv) toggle command: permanent night vision effect for
  players with essentials.nightvision; essentials.nightvision.others allows
  toggling for other players. Fabric-only addition, noted in the parity
  manifest.
- Portable workstation menus (anvil, cartography table, grindstone, loom,
  smithing table, stonecutter, workbench) closed on the next tick because
  vanilla's stillValid check looked for the matching block at the player's
  position. Menus now keep a real level anchor for sounds/crafting updates
  but override stillValid to always pass.
- mod_version bumped to 1.3.0.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EYfnDNjsMCprfh1CWcGd7V

Author: Ascacos

fabric/core/src/main/java/net/essentialsx/fabric/CommandRegistrar.java

@@ -8,7 +8,7 @@
 
 /**
  * Registers every core command with its upstream aliases (generated from the locked
- * EssentialsX {@code plugin.yml}; see parity/commands.yml). 153 commands.
+ * EssentialsX {@code plugin.yml}; see parity/commands.yml). 153 upstream commands plus /nightvision.
  */
 public final class CommandRegistrar {
     private CommandRegistrar() {
@@ -101,6 +101,7 @@ public static void registerAll(final Essentials ess) {
         reg(r, new Commandmute(), "emute", "silence", "esilence", "unmute", "eunmute");
         reg(r, new Commandnear(), "enear", "nearby", "enearby");
         reg(r, new Commandnick(), "enick", "nickname", "enickname");
+        reg(r, new Commandnightvision(), "nv", "enightvision", "env"); // Fabric-only addition
         reg(r, new Commandnuke(), "enuke");
         reg(r, new Commandpay(), "epay");
         reg(r, new Commandpayconfirmtoggle(), "epayconfirmtoggle", "payconfirmoff", "epayconfirmoff", "payconfirmon", "epayconfirmon", "payconfirm", "epayconfirm");

fabric/core/src/main/java/net/essentialsx/fabric/commands/Commandnightvision.java

@@ -0,0 +1,55 @@
+package net.essentialsx.fabric.commands;
+
+import net.essentialsx.fabric.command.CommandSource;
+import net.essentialsx.fabric.command.EssentialsToggleCommand;
+import net.essentialsx.fabric.user.User;
+import net.essentialsx.fabric.utils.CommonPlaceholders;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+
+/**
+ * Toggles a permanent night vision effect (Fabric-only addition, not an upstream command).
+ * The effect is a vanilla infinite-duration status effect, so it survives relogs and death
+ * only as vanilla would, and can be cleared with /nightvision off or vanilla /effect clear.
+ */
+public class Commandnightvision extends EssentialsToggleCommand {
+    public Commandnightvision() {
+        super("nightvision", "essentials.nightvision.others");
+    }
+
+    @Override
+    protected void run(final MinecraftServer server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
+        toggleOtherPlayers(server, sender, args);
+    }
+
+    @Override
+    protected void run(final MinecraftServer server, final User user, final String commandLabel, final String[] args) throws Exception {
+        handleToggleWithArgs(server, user, args);
+    }
+
+    private static boolean hasPermanentNightVision(final ServerPlayer player) {
+        final MobEffectInstance effect = player.getEffect(MobEffects.NIGHT_VISION);
+        return effect != null && effect.isInfiniteDuration();
+    }
+
+    @Override
+    protected void togglePlayer(final CommandSource sender, final User user, Boolean enabled) {
+        final ServerPlayer player = user.getBase();
+        if (enabled == null) {
+            enabled = !hasPermanentNightVision(player);
+        }
+        if (enabled) {
+            // Replace any potion-based (finite) night vision with the permanent one; no particles, keep the HUD icon.
+            player.removeEffect(MobEffects.NIGHT_VISION);
+            player.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, MobEffectInstance.INFINITE_DURATION, 0, false, false, true));
+        } else {
+            player.removeEffect(MobEffects.NIGHT_VISION);
+        }
+        user.sendTl("nightVision", CommonPlaceholders.enableDisable(user.getSource(), enabled), user.getDisplayName());
+        if (!sender.isPlayer() || !sender.getPlayer().equals(player)) {
+            sender.sendTl("nightVision", CommonPlaceholders.enableDisable(user.getSource(), enabled), user.getDisplayName());
+        }
+    }
+}

fabric/core/src/main/java/net/essentialsx/fabric/items/Workstations.java

@@ -22,8 +22,8 @@
 import net.minecraft.world.item.ItemStack;
 
 /**
- * Portable vanilla screen handlers (Section 11.3). Menus use an unrestricted
- * {@link ContainerLevelAccess} so they stay valid without a nearby block.
+ * Portable vanilla screen handlers (Section 11.3). Menus are anchored at the player's position
+ * but skip vanilla's "matching block nearby" validity check so they stay open without a block.
  */
 public final class Workstations {
     private Workstations() {
@@ -52,44 +52,74 @@ private interface MenuFactory {
         AbstractContainerMenu create(int id, Inventory inventory);
     }
 
-    /** Menu wrapper that never closes because the player is "too far" from a block. */
-    private static final class AlwaysValid {
-        static ContainerLevelAccess of(final ServerPlayer player) {
-            return new ContainerLevelAccess() {
-                @Override
-                public <T> java.util.Optional<T> evaluate(final java.util.function.BiFunction<net.minecraft.world.level.Level, net.minecraft.core.BlockPos, T> function) {
-                    return java.util.Optional.ofNullable(function.apply(player.level(), player.blockPosition()));
-                }
-            };
-        }
-    }
+    /*
+     * Each portable menu keeps a real ContainerLevelAccess at the player's position so vanilla can
+     * still run its block-side effects (crafting result updates, anvil/stonecutter/loom sounds,
+     * grindstone XP), but overrides stillValid: vanilla's check requires the matching block to be
+     * at that position and there is none, which would close the screen on the next tick.
+     */
 
     public static void openAnvil(final ServerPlayer player) {
-        open(player, Component.translatable("container.repair"), (id, inv) -> new AnvilMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.repair"), (id, inv) -> new AnvilMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     public static void openCartography(final ServerPlayer player) {
-        open(player, Component.translatable("container.cartography_table"), (id, inv) -> new CartographyTableMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.cartography_table"), (id, inv) -> new CartographyTableMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     public static void openGrindstone(final ServerPlayer player) {
-        open(player, Component.translatable("container.grindstone_title"), (id, inv) -> new GrindstoneMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.grindstone_title"), (id, inv) -> new GrindstoneMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     public static void openLoom(final ServerPlayer player) {
-        open(player, Component.translatable("container.loom"), (id, inv) -> new LoomMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.loom"), (id, inv) -> new LoomMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     public static void openSmithing(final ServerPlayer player) {
-        open(player, Component.translatable("container.upgrade"), (id, inv) -> new SmithingMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.upgrade"), (id, inv) -> new SmithingMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     public static void openStonecutter(final ServerPlayer player) {
-        open(player, Component.translatable("container.stonecutter"), (id, inv) -> new StonecutterMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.stonecutter"), (id, inv) -> new StonecutterMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     public static void openWorkbench(final ServerPlayer player) {
-        open(player, Component.translatable("container.crafting"), (id, inv) -> new CraftingMenu(id, inv, AlwaysValid.of(player)));
+        open(player, Component.translatable("container.crafting"), (id, inv) -> new CraftingMenu(id, inv, access(player)) {
+            @Override
+            public boolean stillValid(final Player p) {
+                return true;
+            }
+        });
     }
 
     /**

fabric/core/src/main/resources/messages.properties

@@ -835,6 +835,11 @@ nearCommandUsage4Description=Lists all players within the given radius of the sp
 nearbyPlayers=<primary>Players nearby\:<reset> {0}
 nearbyPlayersList={0}<white>(<secondary>{1}m<white>)
 negativeBalanceError=<dark_red>User is not allowed to have a negative balance.
+nightVision=<primary>Set night vision<secondary> {0} <primary>for {1}<primary>.
+nightvisionCommandDescription=Toggles permanent night vision.
+nightvisionCommandUsage=/<command> [player] [on|off]
+nightvisionCommandUsage1=/<command> [player]
+nightvisionCommandUsage1Description=Toggles night vision for yourself or another player if specified
 nickChanged=<primary>Nickname changed.
 nickCommandDescription=Change your nickname or that of another player.
 nickCommandUsage=/<command> [player] <nickname|off>

fabric/gradle.properties

@@ -9,7 +9,7 @@ fabric_api_version=0.116.15+1.21.1
 loom_version=1.17.20
 
 # Mod
-mod_version=1.2.1
+mod_version=1.3.0
 maven_group=net.essentialsx.fabric
 
 # Integrations

fabric/parity/commands.yml

@@ -244,6 +244,10 @@ commands:
   nick:
     aliases: [enick, nickname, enickname]
     class: net.essentialsx.fabric.commands.Commandnick
+  nightvision:
+    aliases: [nv, enightvision, env]
+    class: net.essentialsx.fabric.commands.Commandnightvision
+    note: Fabric-only addition (no upstream equivalent); permission essentials.nightvision
   nuke:
     aliases: [enuke]
     class: net.essentialsx.fabric.commands.Commandnuke